kov changed libgksu/branches/libgksu2/ChangeLog, libgksu/branches/libgksu2/Makefile.am, libgksu/branches/libgksu2/aclocal.m4, libgksu/branches/libgksu2/config.h.in, libgksu/branches/libgksu2/configure.ac, libgksu/branches/libgksu2/intl/, libgksu/branches/libgksu2/intltool-extract.in, libgksu/branches/libgksu2/po/POTFILES.in, libgksu/branches/libgksu2/po/ca.po, libgksu/branches/libgksu2/po/cs.po, libgksu/branches/libgksu2/po/da.po, libgksu/branches/libgksu2/po/de.po, libgksu/branches/libgksu2/po/es.po, libgksu/branches/libgksu2/po/eu.po, libgksu/branches/libgksu2/po/hu.po, libgksu/branches/libgksu2/po/nb.po, libgksu/branches/libgksu2/po/nl.po, libgksu/branches/libgksu2/po/pl.po, libgksu/branches/libgksu2/po/pt_BR.po, libgksu/branches/libgksu2/po/ro.po, libgksu/branches/libgksu2/po/ru.po, libgksu/branches/libgksu2/po/sk.po

Gustavo Noronha kov at costa.debian.org
Sat Jan 7 23:20:13 UTC 2006


Mensagem de log: 
revamping i18n infra-structure

-----


Modified: libgksu/branches/libgksu2/ChangeLog
===================================================================
--- libgksu/branches/libgksu2/ChangeLog	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/ChangeLog	2006-01-07 23:20:07 UTC (rev 500)
@@ -1,5 +1,9 @@
 2006-01-07  Gustavo Noronha Silva  <kov at debian.org>
 
+	* configure.ac, Makefile.am, others:
+	- revamping the i18n infra-structure; mainly removing
+	  local intl/ copy and updating files
+
 	* configure.ac:
 	- do not create pkg-config files for libgksuui; it won't
 	  be installed anymore

Modified: libgksu/branches/libgksu2/Makefile.am
===================================================================
--- libgksu/branches/libgksu2/Makefile.am	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/Makefile.am	2006-01-07 23:20:07 UTC (rev 500)
@@ -2,7 +2,7 @@
 
 DISTCLEANFILES = *~ intltool-extract intltool-merge intltool-update gksu.schemas
 
-SUBDIRS = m4 intl po libgksuui libgksu docs
+SUBDIRS = m4 po libgksuui libgksu docs
 DIST_SUBDIRS = $(SUBDIRS)
 
 ACLOCAL_AMFLAGS = -I m4

Modified: libgksu/branches/libgksu2/aclocal.m4
===================================================================
--- libgksu/branches/libgksu2/aclocal.m4	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/aclocal.m4	2006-01-07 23:20:07 UTC (rev 500)
@@ -13634,1053 +13634,95 @@
 AC_DEFUN([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL($@)])
 
 
-# gettext.m4 serial 28 (gettext-0.13)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
+# 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 <drepper at cygnus.com>, 1995, 1996
+#
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version 
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen <mclasen at redhat.com> 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 Authors:
-dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
 dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
+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
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Set USE_NLS.
-  AM_NLS
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
-
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-              [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
-            dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-                [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
-               ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-    AC_SUBST(INTLOBJS)
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
-])
-
-
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_C_CONST])dnl
-  AC_REQUIRE([bh_C_SIGNED])dnl
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
-  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
-  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
-  AC_REQUIRE([gt_TYPE_WINT_T])dnl
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  AC_REQUIRE([gt_TYPE_INTMAX_T])
-  AC_REQUIRE([gt_PRINTF_POSIX])
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-  AC_REQUIRE([gl_XSIZE])dnl
-
-  AC_CHECK_TYPE([ptrdiff_t], ,
-    [AC_DEFINE([ptrdiff_t], [long],
-       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
-    ])
-  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
-__fsetlocking])
-
-  dnl Use the _snprintf function only if it is declared (because on NetBSD it
-  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
-  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-  AC_SUBST([HAVE_POSIX_PRINTF])
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-  AC_SUBST([HAVE_ASPRINTF])
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-  AC_SUBST([HAVE_SNPRINTF])
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-  AC_SUBST([HAVE_WPRINTF])
-
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  if test $ac_cv_header_locale_h = yes; then
-    AM_LC_MESSAGES
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-])
-
-
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
-dnl Check whether a function is declared.
-AC_DEFUN([gt_CHECK_DECL],
-[
-  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
-    [AC_TRY_COMPILE([$2], [
-#ifndef $1
-  char *p = (char *) $1;
-#endif
-], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
-  if test $ac_cv_have_decl_$1 = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
-    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-# po.m4 serial 3 (gettext-0.14)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
 dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
 
-dnl Authors:
-dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AM_NLS])dnl
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-      GMSGFMT=":"
+# 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 <locale.h>], [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 <locale.h> file defines LC_MESSAGES.])
     fi
-  fi
+  fi])
 
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
-
-  AC_OUTPUT_COMMANDS([
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              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 "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
-  # When this code is run, in config.status, two variables have already been
-  # set:
-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-  # - LINGUAS is the value of the environment variable LINGUAS at configure
-  #   time.
-
-changequote(,)dnl
-  # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-  # In autoconf-2.13 it is called $ac_given_srcdir.
-  # In autoconf-2.50 it is called $srcdir.
-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-  case "$ac_given_srcdir" in
-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-    /*) top_srcdir="$ac_given_srcdir" ;;
-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  # Find a way to echo strings without interpreting backslash.
-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-    gt_echo='echo'
-  else
-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-      gt_echo='printf %s\n'
-    else
-      echo_func () {
-        cat <<EOT
-$*
-EOT
-      }
-      gt_echo='echo_func'
-    fi
-  fi
-
-  # A sed script that extracts the value of VARIABLE from a Makefile.
-  sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^[	 ]*VARIABLE[	 ]*=/{
-  # Seen the first line of the variable definition.
-  s/^[	 ]*VARIABLE[	 ]*=//
-  ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
-  POMAKEFILEDEPS=""
-
-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-  fi
-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-    # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-  else
-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
-    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-  fi
-  # Hide the ALL_LINGUAS assigment from automake.
-  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-  # Compute POFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-  # Compute UPDATEPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-  # Compute DUMMYPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-  # Compute GMOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-  # Compute PROPERTIESFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
-  # Compute CLASSFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
-  # Compute QMFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-  # Compute MSGFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-  case "$ac_given_srcdir" in
-    .) srcdirpre= ;;
-    *) srcdirpre='$(srcdir)/' ;;
-  esac
-  POFILES=
-  UPDATEPOFILES=
-  DUMMYPOFILES=
-  GMOFILES=
-  PROPERTIESFILES=
-  CLASSFILES=
-  QMFILES=
-  MSGFILES=
-  RESOURCESDLLFILES=
-  for lang in $ALL_LINGUAS; do
-    POFILES="$POFILES $srcdirpre$lang.po"
-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
-    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
-    QMFILES="$QMFILES $srcdirpre$lang.qm"
-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-  done
-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
-  # environment variable.
-  INST_LINGUAS=
-  if test -n "$ALL_LINGUAS"; then
-    for presentlang in $ALL_LINGUAS; do
-      useit=no
-      if test "%UNSET%" != "$LINGUAS"; then
-        desiredlanguages="$LINGUAS"
-      else
-        desiredlanguages="$ALL_LINGUAS"
-      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 "$desiredlang" in
-          "$presentlang"*) useit=yes;;
-        esac
-      done
-      if test $useit = yes; then
-        INST_LINGUAS="$INST_LINGUAS $presentlang"
-      fi
-    done
-  fi
-  CATALOGS=
-  JAVACATALOGS=
-  QTCATALOGS=
-  TCLCATALOGS=
-  CSHARPCATALOGS=
-  if test -n "$INST_LINGUAS"; then
-    for lang in $INST_LINGUAS; do
-      CATALOGS="$CATALOGS $lang.gmo"
-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-      QTCATALOGS="$QTCATALOGS $lang.qm"
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-    done
-  fi
-
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if test -n "$POMAKEFILEDEPS"; then
-    cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
-  fi
-  mv "$ac_file.tmp" "$ac_file"
-])
-
-# nls.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
-])
-
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
-  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 it.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
-])
-
-# progtest.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper at cygnus.com>, 1996.
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+# 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]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", 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 "[$]$1" in
-  [[\\/]]* | ?:[[\\/]]*)
-    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-    ;;
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
   *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
 dnl If no 4th arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
 ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
 ])dnl
-    ;;
+  ;;
 esac])dnl
 $1="$ac_cv_path_$1"
 if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
@@ -14691,1576 +13733,303 @@
 AC_SUBST($1)dnl
 ])
 
-# lib-prefix.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+  dnl NLS is obligatory
+  [USE_NLS=yes
+    AC_SUBST(USE_NLS)
 
-dnl From Bruno Haible.
+    gt_cv_have_gettext=no
 
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
 
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
+    AC_CHECK_HEADER(libintl.h,
+     [gt_cv_func_dgettext_libintl="no"
+      libintl_extra_libs=""
+
+      #
+      # First check in libc
+      #
+      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+        [AC_TRY_LINK([
+#include <libintl.h>
+],
+         [return !ngettext ("","", 1)],
+	  gt_cv_func_ngettext_libc=yes,
+          gt_cv_func_ngettext_libc=no)
         ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+        	[AC_TRY_LINK([
+#include <libintl.h>
+],
+	          [return !dgettext ("","")],
+		  gt_cv_func_dgettext_libc=yes,
+	          gt_cv_func_dgettext_libc=no)
+        	])
       fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+        AC_CHECK_FUNCS(bind_textdomain_codeset)
       fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
 
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
+      #
+      # If we don't have everything we want, check in libintl
+      #
+      if test "$gt_cv_func_dgettext_libc" != "yes" \
+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+        
+        AC_CHECK_LIB(intl, bindtextdomain,
+	    [AC_CHECK_LIB(intl, ngettext,
+		    [AC_CHECK_LIB(intl, dgettext,
+			          gt_cv_func_dgettext_libintl=yes)])])
 
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; 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
 
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+        #
+        # 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 "$gt_cv_func_dgettext_libintl" = "yes" ; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS -lintl $libintl_extra_libs"
+          unset ac_cv_func_bind_textdomain_codeset
+          AC_CHECK_FUNCS(bind_textdomain_codeset)
+          LIBS="$glib_save_LIBS"
 
-dnl From Bruno Haible.
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIB[]NAME"
-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib$1-prefix],
-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+            gt_cv_func_dgettext_libc=no
           else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
+            if test "$gt_cv_func_dgettext_libc" = "yes" \
+		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
+              gt_cv_func_dgettext_libintl=no
             fi
           fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux*) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux*) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
         fi
       fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-])
 
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
+      if test "$gt_cv_func_dgettext_libc" = "yes" \
+	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        gt_cv_have_gettext=yes
       fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
+  
+      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        INTLLIBS="-lintl $libintl_extra_libs"
+      fi
+  
+      if test "$gt_cv_have_gettext" = "yes"; 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 "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+	  AC_CHECK_FUNCS(dcgettext)
+	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+	  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="$glib_save_LIBS"
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+    ])
+
+    if test "$gt_cv_have_gettext" = "yes" ; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [always defined to indicate that i18n is enabled])
     fi
-  done
-])
 
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
-*)
-  acl_cv_prog_gnu_ld=no ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
-      *)
-	test "$with_gnu_ld" != yes && break ;;
-      esac
+    dnl Test whether we really found GNU xgettext.
+    if test "$XGETTEXT" != ":"; 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> /dev/null; then
+        : ;
+      else
+        AC_MSG_RESULT(
+	  [found xgettext program is not GNU xgettext; ignore it])
+        XGETTEXT=":"
+      fi
     fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
 
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+    # We need to process the po/ directory.
+    POSUB=po
 
-dnl From Bruno Haible.
+    AC_OUTPUT_COMMANDS(
+      [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
 
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
+    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="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
 
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
-    fi
+    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)
   ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
-])
 
-AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-])
+# 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 "yes".) 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
 
-# isc-posix.m4 serial 2 (gettext-0.11.2)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
-
-# signed.m4 serial 1 (gettext-0.10.40)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([bh_C_SIGNED],
-[
-  AC_CACHE_CHECK([for signed], bh_cv_c_signed,
-   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
-  if test $bh_cv_c_signed = no; then
-    AC_DEFINE(signed, ,
-              [Define to empty if the C compiler doesn't support this keyword.])
-  fi
-])
-
-# longlong.m4 serial 4
-dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_LONG_LONG if 'long long' works.
-
-AC_DEFUN([jm_AC_TYPE_LONG_LONG],
-[
-  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
-  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
-    [long long llmax = (long long) -1;
-     return ll << i | ll >> i | llmax / ll | llmax % ll;],
-    ac_cv_type_long_long=yes,
-    ac_cv_type_long_long=no)])
-  if test $ac_cv_type_long_long = yes; then
-    AC_DEFINE(HAVE_LONG_LONG, 1,
-      [Define if you have the 'long long' type.])
-  fi
-])
-
-# longdouble.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether the compiler supports the 'long double' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_LONGDOUBLE],
-[
-  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
-    [if test "$GCC" = yes; then
-       gt_cv_c_long_double=yes
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
      else
-       AC_TRY_COMPILE([
-         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
-         long double foo = 0.0;
-         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
-         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
-         ], ,
-         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
-     fi])
-  if test $gt_cv_c_long_double = yes; then
-    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
-  fi
-])
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         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 "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
 
-# wchar_t.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
 
-dnl From Bruno Haible.
-dnl Test whether <stddef.h> has the 'wchar_t' type.
-dnl Prerequisite: AC_PROG_CC
+   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 "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
 
-AC_DEFUN([gt_TYPE_WCHAR_T],
-[
-  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
-    [AC_TRY_COMPILE([#include <stddef.h>
-       wchar_t foo = (wchar_t)'\0';], ,
-       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
-  if test $gt_cv_c_wchar_t = yes; then
-    AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
-  fi
-])
-
-# wint_t.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether <wchar.h> has the 'wint_t' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_WINT_T],
-[
-  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
-    [AC_TRY_COMPILE([#include <wchar.h>
-       wint_t foo = (wchar_t)'\0';], ,
-       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
-  if test $gt_cv_c_wint_t = yes; then
-    AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
-  fi
-])
-
-# inttypes_h.m4 serial 5 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_inttypes_h=yes,
-    jm_ac_cv_header_inttypes_h=no)])
-  if test $jm_ac_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
-
-# stdint_h.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
-[
-  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_stdint_h=yes,
-    jm_ac_cv_header_stdint_h=no)])
-  if test $jm_ac_cv_header_stdint_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
-
-# intmax.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether the system has the 'intmax_t' type, but don't attempt to
-dnl find a replacement if it is lacking.
-
-AC_DEFUN([gt_TYPE_INTMAX_T],
-[
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
-    [AC_TRY_COMPILE([
-#include <stddef.h> 
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
-  if test $gt_cv_c_intmax_t = yes; then
-    AC_DEFINE(HAVE_INTMAX_T, 1,
-      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
-
-# printf-posix.m4 serial 2 (gettext-0.13.1)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-dnl Test whether the printf() function supports POSIX/XSI format strings with
-dnl positions.
-
-AC_DEFUN([gt_PRINTF_POSIX],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
-    gt_cv_func_printf_posix,
-    [
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
-   dollar expansion (possibly an autoconf bug).  */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
-{
-  sprintf (buf, format, 33, 55);
-  return (strcmp (buf, "55 33") != 0);
-}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
-      [
-        AC_EGREP_CPP(notposix, [
-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
-  notposix
-#endif
-        ], gt_cv_func_printf_posix="guessing no",
-           gt_cv_func_printf_posix="guessing yes")
-      ])
-    ])
-  case $gt_cv_func_printf_posix in
-    *yes)
-      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
-        [Define if your printf() function supports format strings with positions.])
-      ;;
-  esac
-])
-
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([jm_GLIBC21],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
-
-# intdiv0.m4 serial 1 (gettext-0.11.3)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gt_INTDIV0],
-[
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-    gt_cv_int_divbyzero_sigfpe,
-    [
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (1);
-}
-], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-        [
-          # Guess based on the CPU.
-          case "$host_cpu" in
-            alpha* | i[34567]86 | m68k | s390*)
-              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-            *)
-              gt_cv_int_divbyzero_sigfpe="guessing no";;
-          esac
-        ])
-    ])
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
-  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-    [Define if integer division by zero raises signal SIGFPE.])
-])
-
-# uintmax_t.m4 serial 7 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-AC_PREREQ(2.13)
-
-# Define uintmax_t to 'unsigned long' or 'unsigned long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-[
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-    test $ac_cv_type_unsigned_long_long = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-      [Define to unsigned long or unsigned long long
-       if <stdint.h> and <inttypes.h> don't define.])
-  else
-    AC_DEFINE(HAVE_UINTMAX_T, 1,
-      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
-
-# ulonglong.m4 serial 3
-dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
-
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-[
-  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
-    [unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-    ac_cv_type_unsigned_long_long=yes,
-    ac_cv_type_unsigned_long_long=no)])
-  if test $ac_cv_type_unsigned_long_long = yes; then
-    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-      [Define if you have the 'unsigned long long' type.])
-  fi
-])
-
-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gt_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-  [
-    AC_TRY_COMPILE(
-      [#include <sys/types.h>
-#include <inttypes.h>],
-      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+   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 "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
   ])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-  fi
-])
 
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-# macros to non-string values.  This is the case on AIX 4.3.3.
-
-AC_DEFUN([gt_INTTYPES_PRI],
-[
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-      gt_cv_inttypes_pri_broken,
-      [
-        AC_TRY_COMPILE([#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-      ])
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
-    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-  fi
+# 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="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+if test "x$CATOBJEXT" = "x.mo" ; then
+  localedir=`eval echo "${libdir}/locale"`
+else
+  localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+  [Define the location where the catalogs will be installed])
 ])
 
-# xsize.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-AC_DEFUN([gl_XSIZE],
-[
-  dnl Prerequisites of lib/xsize.h.
-  AC_REQUIRE([gl_SIZE_MAX])
-  AC_CHECK_HEADERS(stdint.h)
-])
-
-# size_max.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gl_SIZE_MAX],
-[
-  AC_CHECK_HEADERS(stdint.h)
-  dnl First test whether the system already has SIZE_MAX.
-  AC_MSG_CHECKING([for SIZE_MAX])
-  result=
-  AC_EGREP_CPP([Found it], [
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
-], result=yes)
-  if test -z "$result"; then
-    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
-    dnl than the type 'unsigned long'.
-    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
-    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
-    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
-      [#include <stddef.h>], result=?)
-    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
-      [#include <stddef.h>], result=?)
-    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
-      [#include <stddef.h>], result=?)
-    if test "$fits_in_uint" = 1; then
-      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
-      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
-      AC_TRY_COMPILE([#include <stddef.h>
-        extern size_t foo;
-        extern unsigned long foo;
-        ], [], fits_in_uint=0)
-    fi
-    if test -z "$result"; then
-      if test "$fits_in_uint" = 1; then
-        result="$res_hi$res_lo"U
-      else
-        result="$res_hi$res_lo"UL
-      fi
-    else
-      dnl Shouldn't happen, but who knows...
-      result='~(size_t)0'
-    fi
-  fi
-  AC_MSG_RESULT([$result])
-  if test "$result" != yes; then
-    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
-      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
-  fi
-])
-
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
-
-# lcmessage.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
 dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
+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
 
-dnl Authors:
-dnl   Ulrich Drepper <drepper at cygnus.com>, 1995.
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-
-AC_DEFUN([AM_LC_MESSAGES],
-[
-  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-    [AC_TRY_LINK([#include <locale.h>], [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 <locale.h> file defines LC_MESSAGES.])
-  fi
-])
-

Modified: libgksu/branches/libgksu2/config.h.in
===================================================================
--- libgksu/branches/libgksu2/config.h.in	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/config.h.in	2006-01-07 23:20:07 UTC (rev 500)
@@ -1,227 +1,59 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
 /* gettext domain */
 #undef DOMAIN
 
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
+/* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS
 
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
+/* gettext package */
+#undef GETTEXT_PACKAGE
 
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
 
-/* Define to 1 if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
-
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
+/* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-   don't. */
-#undef HAVE_DECL_FEOF_UNLOCKED
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-   you don't. */
-#undef HAVE_DECL_FGETS_UNLOCKED
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-   don't. */
-#undef HAVE_DECL_GETC_UNLOCKED
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-   don't. */
-#undef HAVE_DECL__SNPRINTF
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
-   don't. */
-#undef HAVE_DECL__SNWPRINTF
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the `fwprintf' function. */
-#undef HAVE_FWPRINTF
-
-/* Define to 1 if you have the `getcwd' function. */
-#undef HAVE_GETCWD
-
-/* Define to 1 if you have the `getegid' function. */
-#undef HAVE_GETEGID
-
-/* Define to 1 if you have the `geteuid' function. */
-#undef HAVE_GETEUID
-
-/* Define to 1 if you have the `getgid' function. */
-#undef HAVE_GETGID
-
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define to 1 if you have the `getuid' function. */
-#undef HAVE_GETUID
-
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
-
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_INTMAX_T
-
-/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
+/* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-   declares uintmax_t. */
-#undef HAVE_INTTYPES_H_WITH_UINTMAX
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
-
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
-/* Define if you have the 'long double' type. */
-#undef HAVE_LONG_DOUBLE
-
-/* Define if you have the 'long long' type. */
-#undef HAVE_LONG_LONG
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the `mempcpy' function. */
-#undef HAVE_MEMPCPY
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define to 1 if you have the `munmap' function. */
-#undef HAVE_MUNMAP
-
-/* Define to 1 if you have the <nl_types.h> header file. */
-#undef HAVE_NL_TYPES_H
-
-/* Define if your printf() function supports format strings with positions. */
-#undef HAVE_POSIX_PRINTF
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
-
-/* Define to 1 if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
-#undef HAVE_STDINT_H_WITH_UINTMAX
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `stpcpy' function. */
-#undef HAVE_STPCPY
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define to 1 if you have the `tsearch' function. */
-#undef HAVE_TSEARCH
-
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
-
-/* Define if you have the 'wchar_t' type. */
-#undef HAVE_WCHAR_T
-
-/* Define to 1 if you have the `wcslen' function. */
-#undef HAVE_WCSLEN
-
-/* Define if you have the 'wint_t' type. */
-#undef HAVE_WINT_T
-
-/* Define to 1 if you have the `__argz_count' function. */
-#undef HAVE___ARGZ_COUNT
-
-/* Define to 1 if you have the `__argz_next' function. */
-#undef HAVE___ARGZ_NEXT
-
-/* Define to 1 if you have the `__argz_stringify' function. */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define to 1 if you have the `__fsetlocking' function. */
-#undef HAVE___FSETLOCKING
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#undef INTDIV0_RAISES_SIGFPE
-
 /* package name */
 #undef PACKAGE
 
@@ -240,49 +72,8 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-#undef PRI_MACROS_BROKEN
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-#undef SIZE_MAX
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* package version */
 #undef VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define as the type of the result of subtracting two pointers, if the system
-   doesn't define it. */
-#undef ptrdiff_t
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-#undef signed
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-#undef uintmax_t

Modified: libgksu/branches/libgksu2/configure.ac
===================================================================
--- libgksu/branches/libgksu2/configure.ac	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/configure.ac	2006-01-07 23:20:07 UTC (rev 500)
@@ -37,9 +37,12 @@
 # Checks for library functions.
 ALL_LINGUAS="ca cs da de es eu hu pl pt_BR ro ru sk nb nl"
 
+AC_DEFINE(GETTEXT_PACKAGE, AC_PACKAGE_NAME, [gettext package])
+GETTEXT_PACKAGE=AC_PACKAGE_NAME
+AC_SUBST(GETTEXT_PACKAGE)
+
 IT_PROG_INTLTOOL
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION(0.14.1)
+AM_GLIB_GNU_GETTEXT
 
 ##################################################
 # Check for gtk-doc.
@@ -75,7 +78,6 @@
 AC_CONFIG_FILES([
 	Makefile
 	m4/Makefile
-	intl/Makefile
 	po/Makefile.in
 	libgksu/Makefile
 	libgksu/libgksu2.pc

Modified: libgksu/branches/libgksu2/intltool-extract.in
===================================================================
--- libgksu/branches/libgksu2/intltool-extract.in	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/intltool-extract.in	2006-01-07 23:20:07 UTC (rev 500)
@@ -485,10 +485,12 @@
 sub intltool_tree_comment
 {
     my $expat = shift;
-    my $data  = shift;
+    my $data  = $expat->original_string();
     my $clist = $expat->{Curlist};
     my $pos   = $#$clist;
 
+    $data =~ s/^<!--//s;
+    $data =~ s/-->$//s;
     push @$clist, 1 => $data;
 }
 

Modified: libgksu/branches/libgksu2/po/POTFILES.in
===================================================================
--- libgksu/branches/libgksu2/po/POTFILES.in	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/POTFILES.in	2006-01-07 23:20:07 UTC (rev 500)
@@ -1 +1,2 @@
-libgksu/gksu-context.c
+libgksu/libgksu.c
+libgksuui/gksuui-dialog.c

Modified: libgksu/branches/libgksu2/po/ca.po
===================================================================
--- libgksu/branches/libgksu2/po/ca.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/ca.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgksu1.2\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2004-08-03 18:59+0200\n"
 "Last-Translator: Jordi Mallach <jordi at sindominio.net>\n"
 "Language-Team: Catalan <tradgnome at softcatala.org>\n"
@@ -15,47 +15,119 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:331
+#, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "No s'ha pogut obtenir la clau d'xauth: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "S'ha produït un error en copiar «%s» a «%s»: %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "No es pot executar /bin/su: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr "gksu_run necessita una ordre a executar, no s'ha donat cap."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr "L'ordre gksu-run-helper no s'ha trobat o no és executable."
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "No es pot executar /bin/su: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "No s'ha pogut bifurcar un procés nou: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Contrasenya incorrecta."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -66,58 +138,71 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "No s'ha pogut llegir del conducte amb el fill: %s"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "El fill ha finalitzat amb l'estat %d"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr "gksu_sudo_run necessita una ordre a executar, no s'ha donat cap."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr "No s'ha pogut copiar el fitxer d'autorització d'X de l'usuari."
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "S'ha produït un error en crear el conducte: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "No s'ha pogut executar un procés nou: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "S'ha produït un error en obrir el conducte: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "No s'ha donat cap contrasenya i sudo la necessita."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr ""
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "El fill ha finalitzat amb l'estat %d"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+msgid "Password:"
+msgstr ""
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "No s'ha donat cap contrasenya i sudo la necessita."
+
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
 #~ "exists! This is highly suspicous!"

Modified: libgksu/branches/libgksu2/po/cs.po
===================================================================
--- libgksu/branches/libgksu2/po/cs.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/cs.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgksu\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2005-10-03 18:12+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -15,12 +15,84 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:331
+#, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "Selhalo získání xauth klíče: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
@@ -30,35 +102,35 @@
 "znamenat bezpečnostní problém. Situaci prozkoumejte a raději také varujte "
 "svého systémového správce."
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "Chyba kopírování '%s' do '%s': %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Nemohu spustit /bin/su: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr "gksu_run vyžaduje příkaz, který má spustit; žádný nebyl zadán."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr "Příkaz gksu-run-helper nebyl nalezen, nebo nemá práva pro spouštění."
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Nemohu spustit /bin/su: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "Selhalo oddělení nového procesu: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Chybné heslo."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -75,48 +147,44 @@
 "Očekáváno:\n"
 " %s"
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "Nemohu číst z roury s potomkem: %s"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, c-format
 msgid "su terminated with %d status"
 msgstr "su skončil se stavem %d"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr "gksu_sudo_run vyžaduje příkaz, který má spustit; žádný nebyl zadán."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr "Nemohu zkopírovat uživatelův soubor Xauthorization."
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "Chyba při vytváření roury: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "Selhalo spuštění nového procesu: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "Chyba při otevírání roury: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "Nebylo zadáno žádné heslo, avšak sudo jej vyžaduje."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr "Heslo: "
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
@@ -124,11 +192,29 @@
 "Níže ležící autentizační mechanismus (sudo) nepovoluje spuštění tohoto "
 "programu. Kontaktujte prosím svého systémového správce."
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, c-format
 msgid "sudo terminated with %d status"
 msgstr "sudo skončilo se stavem %d"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+#, fuzzy
+msgid "Password:"
+msgstr "Heslo: "
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "Nebylo zadáno žádné heslo, avšak sudo jej vyžaduje."
+
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
 #~ "exists! This is highly suspicous!"

Modified: libgksu/branches/libgksu2/po/da.po
===================================================================
--- libgksu/branches/libgksu2/po/da.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/da.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgksu 1.0.1\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2004-05-19 21:02+0200\n"
 "Last-Translator: Morten Brix Pedersen <morten at wtf.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -15,47 +15,119 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:331
+#, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "Fejl da xauth nøgle skulle hentes: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "Fejl ved kopiering af '%s' til '%s': %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Fejl ved kørsel af /bin/su: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr "gksu_run kræver en kommando der skal køres, ingen var angivet."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr "gksu-run-helper kommandoen blev ikke fundet eller er ikke eksekvebar."
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Fejl ved kørsel af /bin/su: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "Fejl da ny proces skulle oprettes: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Forkert adgangskode."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -66,58 +138,71 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "Kunne ikke læse fra pipe med barneproces: %s"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Barneproces afsluttede med status %d"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr "gksu_sudo_run kræver en kommando der skal køres, ingen var angivet."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr "Kunne ikke kopiere brugerens Xautorization-fil."
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "Fejl ved oprettelse af pipe: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "Fejl ved eksekvering af ny proces: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "Fejl ved åbning af pipe: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "Ingen adgangskode var angivet, og sudo behøver en."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr ""
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Barneproces afsluttede med status %d"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+msgid "Password:"
+msgstr ""
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "Ingen adgangskode var angivet, og sudo behøver en."
+
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
 #~ "exists! This is highly suspicous!"

Modified: libgksu/branches/libgksu2/po/de.po
===================================================================
--- libgksu/branches/libgksu2/po/de.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/de.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GKsu 0.9.14\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2003-11-18 21:19-0200\n"
 "Last-Translator: Sebastian Heinlein <debian at pimpzkru.de>\n"
 "Language-Team: German <gnome-de at gnome.org>\n"
@@ -16,47 +16,125 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+#, fuzzy
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+"Tastatur oder Maus konnten nicht abgegriffen werden.\n"
+" Es besteht die Möglichkeit, dass ein böswilliger Client die Sitzung "
+"belauscht."
+
+#: ../libgksu/libgksu.c:331
+#, fuzzy, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+"<b>Das Passwort von %s ist erforderlich zum Ausführen von:</b>\n"
+"<i>%s</i>"
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "/bin/su: %s konnte nicht ausgeführt werden"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr ""
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr ""
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "/bin/su: %s konnte nicht ausgeführt werden"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Falsches Passwort."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -67,59 +145,70 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Unterprozess endete mit dem Status %d"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr ""
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr ""
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr ""
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 #, fuzzy
 msgid "Password: "
 msgstr "Passwort:"
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Unterprozess endete mit dem Status %d"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+#, fuzzy
+msgid "Password:"
+msgstr "Passwort:"
+
 #~ msgid ""
 #~ "<b>I need %s's password to run:</b>\n"
 #~ "<i>%s</i>"
@@ -130,15 +219,7 @@
 #~ msgid "Changing user..."
 #~ msgstr "Benutzerwechsel"
 
-#, fuzzy
 #~ msgid ""
-#~ "<b>I need your password to run:</b>\n"
-#~ "<i>%s</i>"
-#~ msgstr ""
-#~ "<b>Das Passwort von %s ist erforderlich zum Ausführen von:</b>\n"
-#~ "<i>%s</i>"
-
-#~ msgid ""
 #~ "GKsu version %s\n"
 #~ "\n"
 #~ "Usage: %s [-u <user>] [-k] [-l] <command>\n"
@@ -243,12 +324,3 @@
 
 #~ msgid "_Advanced"
 #~ msgstr "_Details"
-
-#~ msgid ""
-#~ "Could not grab keyboard or mouse.\n"
-#~ "A malicious client may be eavesdropping\n"
-#~ "on your session."
-#~ msgstr ""
-#~ "Tastatur oder Maus konnten nicht abgegriffen werden.\n"
-#~ " Es besteht die Möglichkeit, dass ein böswilliger Client die Sitzung "
-#~ "belauscht."

Modified: libgksu/branches/libgksu2/po/es.po
===================================================================
--- libgksu/branches/libgksu2/po/es.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/es.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2005-05-16 03:17+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs at debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -20,48 +20,126 @@
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+#, fuzzy
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+"No puedo bloquear su teclado o raton.\n"
+"Hay algun cliente malicioso que esta escuchando\n"
+"en su sesion."
+
+#: ../libgksu/libgksu.c:331
+#, fuzzy, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+"Necesito su contraseña para ejecutar:\n"
+"%s como %s"
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "Falló al obtener la clave xauth: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "Ocurrió un error copiando '%s' a '%s': %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "No se pudo ejecutar /bin/su: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr ""
 "gksu__run necesita una orden para ejecutar, pero no se proporcionó ninguna."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr "No se encontró la orden gksu-run-helper o no es ejecutable."
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "No se pudo ejecutar /bin/su: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "Falló al bifurcar el proceso nuevo: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Contraseña errónea."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -72,59 +150,72 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "No se pudo leer desde el pipe con el hijo: %s"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Proceso hijo termino con el estado %d"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr ""
 "gksu_sudo_run necesita una orden para ejecutar, no se proporcionó ninguna."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr "No es posible copiar el archivo Xautorization del usuario."
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "Error al crear pipe: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "Falló al efectuar exec del proceso nuevo: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "Error al abrir pipe: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "No se proporcionó ninguna contraseña y sudo la necesita."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr ""
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Proceso hijo termino con el estado %d"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+msgid "Password:"
+msgstr ""
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "No se proporcionó ninguna contraseña y sudo la necesita."
+
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
 #~ "exists! This is highly suspicous!"
@@ -268,15 +359,6 @@
 #~ msgid "_Advanced"
 #~ msgstr "_Avanzadas"
 
-#~ msgid ""
-#~ "Could not grab keyboard or mouse.\n"
-#~ "A malicious client may be eavesdropping\n"
-#~ "on your session."
-#~ msgstr ""
-#~ "No puedo bloquear su teclado o raton.\n"
-#~ "Hay algun cliente malicioso que esta escuchando\n"
-#~ "en su sesion."
-
 #~ msgid "Unable to run /usr/bin/sudo: %s"
 #~ msgstr "No se pudo ejecutar /usr/bin/sudo: %s"
 
@@ -288,10 +370,3 @@
 #~ "Ocurrio un error, su programa\n"
 #~ "esta bloqueado:\n"
 #~ "%s"
-
-#~ msgid ""
-#~ "I need your password to run:\n"
-#~ "%s as %s"
-#~ msgstr ""
-#~ "Necesito su contraseña para ejecutar:\n"
-#~ "%s como %s"

Modified: libgksu/branches/libgksu2/po/eu.po
===================================================================
--- libgksu/branches/libgksu2/po/eu.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/eu.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgksu1.2\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2005-05-17 14:04+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale <librezale at librezale.org>\n"
@@ -16,48 +16,120 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:331
+#, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "Huts xauth gakoa eskuratzerakoan: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "Huts '%s' '%s'-ra kopiatzerakoan: %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Ezin da /bin/su abiarazi: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr ""
 "gksu_run-el abiarazteko komando bat behar du, baina ez da komandorik ezarri."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr "gksu-run-helper komandoa ez da aurkitzen edo ez da abiarazgarria. "
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Ezin da /bin/su abiarazi: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "Huts prozesu berria banatzerakoan: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Okerreko pasahitza."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -68,60 +140,73 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "Ezin da tutu-tik semearekin irakurri: %s"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Semes %d egoeraz amaitu da"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr ""
 "gksu_sudo_run-ek abiarazteko komando bat behar du, baina ez da komandorik "
 "ezarri."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr "Ezind a erabiltzailera X baimen fitxategia kopiatu."
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "Errorea tutua sortzerakoan: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "Huts prozesu berria axekutatzerakoan: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "Huts tutua irekitzerakoan: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "Ez da pasahitzik eman eta sudo-k berau behar du."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr ""
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Semes %d egoeraz amaitu da"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+msgid "Password:"
+msgstr ""
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "Ez da pasahitzik eman eta sudo-k berau behar du."
+
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
 #~ "exists! This is highly suspicous!"

Modified: libgksu/branches/libgksu2/po/hu.po
===================================================================
--- libgksu/branches/libgksu2/po/hu.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/hu.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2005-10-13 11:23+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome.hu>\n"
 "Language-Team: Hungarian <gnome at gnome.hu>\n"
@@ -17,12 +17,84 @@
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:331
+#, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "Nem sikerült megszerezni az xauth kulcsot: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
@@ -31,36 +103,36 @@
 "Az .Xauthority fájl létrehozása lehetetlen: A fájl már létezik. Ez egy "
 "biztonsági probléma lehet, vizsgálja ki vagy értesítse a rendszergazdát."
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "Hiba \"%s\" a következő helyre: %s másolása közben: %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Nem lehet futtatni a /bin/su-t: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr ""
 "A gksu_run-nak szüksége van a futtatandó parancsra, de Ön azt nem adta meg."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr "A gksu-run-helper parancs nem található vagy nem futtatható."
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Nem lehet futtatni a /bin/su-t: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "Nem sikerült új folyamatot létrehozni: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Rossz jelszó."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -77,50 +149,46 @@
 "Az alábbi helyett:\n"
 " %s"
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "Nem lehet olvasni a(z) %s gyermeknél lévő csőből"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, c-format
 msgid "su terminated with %d status"
 msgstr "A su %d állapottal fejeződött be"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr ""
 "A gksu_sudo_run-nak szüksége van a futtatandó parancsra, de Ön azt nem adta "
 "meg."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr "Nem lehet a felhasználó Xauthorization fájlját másolni."
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "Hiba a cső létrehozása közben: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "Nem sikerült új folyamatot végrehajtani: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "Hiba a cső megnyitása közben: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "Nem adott meg jelszót, de a sudonak szüksége van rá."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr "Jelszó: "
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
@@ -128,7 +196,25 @@
 "Az alapul szolgáló hitelesítési mechanizmus (sudo) nem engedélyezi Önnek "
 "ezen program futtatását. Lépjen kapcsolatba a rendszergazdával."
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, c-format
 msgid "sudo terminated with %d status"
 msgstr "A sudo %d állapottal fejeződött be"
+
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+#, fuzzy
+msgid "Password:"
+msgstr "Jelszó: "
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "Nem adott meg jelszót, de a sudonak szüksége van rá."

Modified: libgksu/branches/libgksu2/po/nb.po
===================================================================
--- libgksu/branches/libgksu2/po/nb.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/nb.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gksu 1.0.1\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2004-10-14 24:39-0300\n"
 "Last-Translator: Vidar Braut Haarr <mabus_at_q1n_org>\n"
 "Language-Team: Norwegian Bokmaal <bokmaal_at_firefox_no>\n"
@@ -15,47 +15,125 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+#, fuzzy
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+"Kunne ikke låse tastaturet eller musen.\n"
+"Der er mulig at en annen klient overvåker\n"
+"din sesjon."
+
+#: ../libgksu/libgksu.c:331
+#, fuzzy, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+"<b>Jeg skal bruge %s's adgangskode til at køre:</b>\n"
+"<i>%s</i>"
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "Klarte ikke hente xauth nøkkel: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "Klarte ikke kopiere '%s' til '%s': %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Klarer ikke kjøre /bin/su: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr "gksu_run trenger en kommando å kjøre, men ingen ble gitt."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr "gksu-run-helper kommandoen ble ikke funnet eller er ikke kjørbar"
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Klarer ikke kjøre /bin/su: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "Klarer ikke spalte ut ny prosess: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Feil passord."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -66,60 +144,74 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "Klarte ikke lese fra røret med barneprosessen: %s"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Barneprosess avsluttet med status %d"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr "gksu_sudo_run trenger en kommando å kjøre, men ingen ble gitt."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr ""
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "Klarte ikke opprette rør: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "Klarte ikke kjøre ny prosess: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "Klarte ikke åpne rør: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "sudo trenger et passord, men ingen ble gitt."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 #, fuzzy
 msgid "Password: "
 msgstr "Adgangskode:"
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Barneprosess avsluttet med status %d"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
 #, fuzzy
+msgid "Password:"
+msgstr "Adgangskode:"
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "sudo trenger et passord, men ingen ble gitt."
+
+#, fuzzy
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
 #~ "exists! This is highly suspicous!"
@@ -137,15 +229,7 @@
 #~ msgid "Changing user..."
 #~ msgstr "Skifter bruger..."
 
-#, fuzzy
 #~ msgid ""
-#~ "<b>I need your password to run:</b>\n"
-#~ "<i>%s</i>"
-#~ msgstr ""
-#~ "<b>Jeg skal bruge %s's adgangskode til at køre:</b>\n"
-#~ "<i>%s</i>"
-
-#~ msgid ""
 #~ "GKsu version %s\n"
 #~ "\n"
 #~ "Usage: %s [-u <user>] [-k] [-l] <command>\n"
@@ -252,12 +336,3 @@
 
 #~ msgid "_Advanced"
 #~ msgstr "_Avansert"
-
-#~ msgid ""
-#~ "Could not grab keyboard or mouse.\n"
-#~ "A malicious client may be eavesdropping\n"
-#~ "on your session."
-#~ msgstr ""
-#~ "Kunne ikke låse tastaturet eller musen.\n"
-#~ "Der er mulig at en annen klient overvåker\n"
-#~ "din sesjon."

Modified: libgksu/branches/libgksu2/po/nl.po
===================================================================
--- libgksu/branches/libgksu2/po/nl.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/nl.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgksu1.2-1.2.6\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2005-09-02 11:37+0200\n"
 "Last-Translator: Ronald van Engelen <ronalde at lacocina.nl>\n"
 "Language-Team: Dutch <vertaling at vrijschrift.org>\n"
@@ -15,12 +15,84 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:331
+#, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "Kon xauth-sleutel niet verkrijgen: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
@@ -30,38 +102,38 @@
 "een beveiligingsprobleem kunnen duiden; onderzoek het probleem of licht uw "
 "systeembeheerder in."
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "Fout tijdens kopiëren van '%s' naar '%s': %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Kan /bin/su niet uitvoeren: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr ""
 "voor gksu_run dient een opdracht gespecificeerd te worden, wat niet gedaan "
 "is."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr ""
 "De opdracht gksu-run-helper is niet gevonden of is geen uitvoerbaar bestand."
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Kan /bin/su niet uitvoeren: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "Het maken van een nieuw proces is mislukt: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Verkeerd wachtwoord."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -78,60 +150,74 @@
 "Verwacht:\n"
 " %s"
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "Kan pipe met het kind %s niet uitlezen"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Kindproces afgesloten met status %d"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr ""
 "voor gksu_sudo_run dient een opdracht gespecificeerd te worden, wat niet "
 "gebeurd is."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr "Kan het Xauthorization-bestand van de gebruiker niet kopiëren."
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "Fout bij het maken van pipe: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "Uitvoeren van nieuw proces is mislukt: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "Fout bij het openen van pipe: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "Geen wachtwoord opgegeven terwijl dit nodig is voor sudo."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr "Wachtwoord:"
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Kindproces afgesloten met status %d"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+#, fuzzy
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "Geen wachtwoord opgegeven terwijl dit nodig is voor sudo."
+
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
 #~ "exists! This is highly suspicous!"

Modified: libgksu/branches/libgksu2/po/pl.po
===================================================================
--- libgksu/branches/libgksu2/po/pl.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/pl.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gksu\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2003-10-25 14:37+0200\n"
 "Last-Translator: GNOME PL Team <translators at gnome.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -18,48 +18,126 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+#, fuzzy
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+"Nie udało się przechwycić klawiatury lub \n"
+"myszy. Możliwe, że jakiś złośliwy klient\n"
+"podsłuchuje twoją sesję."
+
+#: ../libgksu/libgksu.c:331
+#, fuzzy, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+"Potrzebne jest twoje hasło, aby uruchomić:\n"
+"%s jako %s"
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "BÅ‚Ä…d podczas kopiowania'%s' do '%s': %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Nie można uruchomić /bin/su: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr ""
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr ""
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Nie można uruchomić /bin/su: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 #, fuzzy
 msgid "Wrong password."
 msgstr "Niewłaściwe hasło, spróbuj ponownie."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -70,58 +148,68 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Proces potomny został przerwany zwracając stan %d "
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr ""
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr ""
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, fuzzy, c-format
 msgid "Error opening pipe: %s"
 msgstr "BÅ‚Ä…d podczas kopiowania'%s' do '%s': %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr ""
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr ""
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Proces potomny został przerwany zwracając stan %d "
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+msgid "Password:"
+msgstr ""
+
 #, fuzzy
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
@@ -228,15 +316,6 @@
 #~ msgstr "Należy podać polecenie do uruchomienia."
 
 #~ msgid ""
-#~ "Could not grab keyboard or mouse.\n"
-#~ "A malicious client may be eavesdropping\n"
-#~ "on your session."
-#~ msgstr ""
-#~ "Nie udało się przechwycić klawiatury lub \n"
-#~ "myszy. Możliwe, że jakiś złośliwy klient\n"
-#~ "podsłuchuje twoją sesję."
-
-#~ msgid ""
 #~ "I need %s's password to run:\n"
 #~ "%s."
 #~ msgstr ""
@@ -256,13 +335,6 @@
 #~ "może być zablokowany:\n"
 #~ "%s"
 
-#~ msgid ""
-#~ "I need your password to run:\n"
-#~ "%s as %s"
-#~ msgstr ""
-#~ "Potrzebne jest twoje hasło, aby uruchomić:\n"
-#~ "%s jako %s"
-
 #~ msgid "Unable to run %s/bin/gksu: %s"
 #~ msgstr "Nie można uruchomić %s/bin/gksu: %s"
 

Modified: libgksu/branches/libgksu2/po/pt_BR.po
===================================================================
--- libgksu/branches/libgksu2/po/pt_BR.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/pt_BR.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gksu 0.9.1\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2004-05-18 14:55-0300\n"
 "Last-Translator: Gustavo Noronha Silva <kov at debian.org>\n"
 "Language-Team: Debian-BR <debian-l10n-portuguese at lists.debian.org>\n"
@@ -14,48 +14,126 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+#, fuzzy
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+"Não pude pegar a entrada do mouse ou teclado.\n"
+"Um cliente malicioso pode estar escutando\n"
+"sua sessão."
+
+#: ../libgksu/libgksu.c:331
+#, fuzzy, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+"Preciso da sua senha para rodar:\n"
+"%s como %s"
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "Falha ao obter chave xauth: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "Erro copiando '%s' para '%s': %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Não pude rodar /bin/su: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr ""
 "a gksu_run precisa de um comando a ser executado e nenhum foi fornecido."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr "O comando gksu-run-helper não foi encontrado ou não está executável."
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Não pude rodar /bin/su: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "Falha ao tentar criar novo processo: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Senha errada."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -66,62 +144,76 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "Não foi possível ler do ecanamento com o filho: %s"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Processo filho terminado com estado %d"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr ""
 "gksu_sudo_run precisa de um comando a ser executado e nenhum foi fornecido."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr ""
 "Não foi possível copiar o arquivo de autorização do X (.Xauthority) do "
 "usuário."
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "Erro ao criar encanamento: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "Falha ao executar novo processo: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "Erro abrindo encanamento: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "Nenhuma senha foi fornecida e o sudo precisa de uma."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 #, fuzzy
 msgid "Password: "
 msgstr "Senha:"
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Processo filho terminado com estado %d"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+#, fuzzy
+msgid "Password:"
+msgstr "Senha:"
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "Nenhuma senha foi fornecida e o sudo precisa de uma."
+
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
 #~ "exists! This is highly suspicous!"
@@ -265,15 +357,6 @@
 #~ "GKSu: Falha ao inicializar a biblioteca Gtk+. O GKSu não conseguirá "
 #~ "continuar!\n"
 
-#~ msgid ""
-#~ "Could not grab keyboard or mouse.\n"
-#~ "A malicious client may be eavesdropping\n"
-#~ "on your session."
-#~ msgstr ""
-#~ "Não pude pegar a entrada do mouse ou teclado.\n"
-#~ "Um cliente malicioso pode estar escutando\n"
-#~ "sua sessão."
-
 #~ msgid "Unable to run /usr/bin/sudo: %s"
 #~ msgstr "Não pude rodar /usr/bin/sudo: %s"
 
@@ -287,13 +370,6 @@
 #~ "%s"
 
 #~ msgid ""
-#~ "I need your password to run:\n"
-#~ "%s as %s"
-#~ msgstr ""
-#~ "Preciso da sua senha para rodar:\n"
-#~ "%s como %s"
-
-#~ msgid ""
 #~ "GKsu version %s\n"
 #~ "\n"
 #~ "Usage: %s [-u <user>] [-k] [-l] <command>\n"

Modified: libgksu/branches/libgksu2/po/ro.po
===================================================================
--- libgksu/branches/libgksu2/po/ro.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/ro.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2005-05-17 01:50+0300\n"
 "Last-Translator: Sorin Batariuc <sorin at bonbon.net>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -16,49 +16,121 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:331
+#, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "Eşuare în obţinerea cheii xauth: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "Eroare la copierea '%s' la '%s': %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Nu pot rula /bin/su: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr ""
 "gksu_run are nevoie de o comandă pentru a rula, şi n-a fost furnizată nici "
 "una."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr "Comanda gksu-run-helper n-a fost găsită sau nu este executabilă."
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Nu pot rula /bin/su: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "Eşuare în a bifurca noul proces: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Parolă greşită."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -69,60 +141,73 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "Nu se poate citi din conexiunea cu sub-procesul: %s"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Sub-proces terminat cu starea %d"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr ""
 "gksu_sudo_run are nevoie de o comandă pentru a rula, şi n-a fost furnizată "
 "nici una."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr "Nu se poate copia fiÅŸierul de autorizare X al utilizatorului."
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "Eroare la crearea conexiunii: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "Eşuare la execuţia noului proces: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "Eroare la deschiderea conexiunii: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "Nici o parolă n-a fost furnizată şi sudo are nevoie de asta."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr ""
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Sub-proces terminat cu starea %d"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+msgid "Password:"
+msgstr ""
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "Nici o parolă n-a fost furnizată şi sudo are nevoie de asta."
+
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
 #~ "exists! This is highly suspicous!"

Modified: libgksu/branches/libgksu2/po/ru.po
===================================================================
--- libgksu/branches/libgksu2/po/ru.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/ru.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2003-05-02 20:56+0300\n"
 "Last-Translator: Aleksander <murygin at aitoc.com>\n"
 "Language-Team: ru <ru at li.org>\n"
@@ -17,47 +17,125 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+#, fuzzy
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+"Íåâîçìîæíî çàõâàòèòü êëàâèàòóðó èëè ìûøü.\n"
+"Çëîáíûé ïîëüçîâàòåëü ìîæåò ïîäñëóøàòü\n"
+"Âàøó ñåññèþ."
+
+#: ../libgksu/libgksu.c:331
+#, fuzzy, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+"Òðåáóåòñÿ ïàðîëü ïîëüçîâàòåëÿ %s äëÿ çàïóñêà:\n"
+"%s."
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Íåâîçìîæíî çàïóñòèòü /bin/su: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr ""
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr ""
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Íåâîçìîæíî çàïóñòèòü /bin/su: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr ""
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -68,58 +146,68 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Ïîòîìîê óíè÷òîæåí ñ %d ñòàòóñîì"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr ""
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr ""
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr ""
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr ""
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Ïîòîìîê óíè÷òîæåí ñ %d ñòàòóñîì"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+msgid "Password:"
+msgstr ""
+
 #, fuzzy
 #~ msgid ""
 #~ "<b>I need %s's password to run:</b>\n"
@@ -133,14 +221,6 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<b>I need your password to run:</b>\n"
-#~ "<i>%s</i>"
-#~ msgstr ""
-#~ "Òðåáóåòñÿ ïàðîëü ïîëüçîâàòåëÿ %s äëÿ çàïóñêà:\n"
-#~ "%s."
-
-#, fuzzy
-#~ msgid ""
 #~ "GKsu version %s\n"
 #~ "\n"
 #~ "Usage: %s [-u <user>] [-k] [-l] <command>\n"
@@ -245,12 +325,3 @@
 
 #~ msgid "_Advanced"
 #~ msgstr "_Äîïîëíèòåëüíî"
-
-#~ msgid ""
-#~ "Could not grab keyboard or mouse.\n"
-#~ "A malicious client may be eavesdropping\n"
-#~ "on your session."
-#~ msgstr ""
-#~ "Íåâîçìîæíî çàõâàòèòü êëàâèàòóðó èëè ìûøü.\n"
-#~ "Çëîáíûé ïîëüçîâàòåëü ìîæåò ïîäñëóøàòü\n"
-#~ "Âàøó ñåññèþ."

Modified: libgksu/branches/libgksu2/po/sk.po
===================================================================
--- libgksu/branches/libgksu2/po/sk.po	2006-01-07 21:46:38 UTC (rev 499)
+++ libgksu/branches/libgksu2/po/sk.po	2006-01-07 23:20:07 UTC (rev 500)
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgksu 1.2.6\n"
-"Report-Msgid-Bugs-To: kov at debian.org\n"
-"POT-Creation-Date: 2005-11-23 22:43-0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-07 20:54-0200\n"
 "PO-Revision-Date: 2005-05-14 21:32+0200\n"
 "Last-Translator: Peter Chabada <sk-i18n_chabada_sk>\n"
 "Language-Team: Slovak <sk-i18n at linux.sk>\n"
@@ -17,47 +17,119 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libgksu/gksu-context.c:473
+#: ../libgksu/libgksu.c:111
 #, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:131
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+
+#: ../libgksu/libgksu.c:169
+msgid ""
+"<b>Could not grab your mouse.</b>\n"
+"\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:179
+msgid ""
+"Could not grab your keyboard.\n"
+"A malicious client may be eavesdropping\n"
+"on your session or you may have just clicked\n"
+"a menu or some application just decided to get\n"
+"focus.\n"
+"\n"
+"Try again."
+msgstr ""
+
+#: ../libgksu/libgksu.c:331
+#, c-format
+msgid ""
+"<b>Please enter your password\n"
+"to run %s as user %s</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:336
+#, c-format
+msgid "<b>To run the program \"%s\" you need to enter the %s password</b>"
+msgstr ""
+
+#: ../libgksu/libgksu.c:423
+#, c-format
+msgid ""
+"<b>The \"%s\" program was started with the privileges of the %s user without "
+"the need to ask for a password, due to your system's authentication "
+"mechanism setup.</b>\n"
+"\n"
+"It is possible that you are being allowed to run specific programs as user %"
+"s without the need for a password, or that the password is cached.\n"
+"This is not a problem report; it's simply a notification to make sure you "
+"are aware of this."
+msgstr ""
+
+#: ../libgksu/libgksu.c:444
+msgid "Do _not display this message again"
+msgstr ""
+
+#: ../libgksu/libgksu.c:464
+msgid ""
+"<b>Would you like your screen to be \"grabbed\"\n"
+"while you enter the password?</b>\n"
+"\n"
+"This means all applications will be paused to avoid\n"
+"the eavesdropping of your password by a a malicious\n"
+"application while you type it."
+msgstr ""
+
+#: ../libgksu/libgksu.c:549
+#, c-format
 msgid "Failed to obtain xauth key: %s"
 msgstr "Zlyhalo získanie xauth kľúča: %s"
 
-#: libgksu/gksu-context.c:533
+#: ../libgksu/libgksu.c:609
 #, c-format
 msgid ""
 "Impossible to create the .Xauthority file: a file already exists. This might "
 "be a security issue; please investigate or warn your system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:538 libgksu/gksu-context.c:548
-#: libgksu/gksu-context.c:558 libgksu/gksu-context.c:567
+#: ../libgksu/libgksu.c:614 ../libgksu/libgksu.c:624 ../libgksu/libgksu.c:634
+#: ../libgksu/libgksu.c:643
 #, c-format
 msgid "Error copying '%s' to '%s': %s"
 msgstr "Chyba počas kopírovania \"%s\" do \"%s\": %s"
 
-#: libgksu/gksu-context.c:657 libgksu/gksu-context.c:816
-#, c-format
-msgid "Unable to run /bin/su: %s"
-msgstr "Nepodarilo sa spustiť /bin/su: %s"
-
-#: libgksu/gksu-context.c:770
+#: ../libgksu/libgksu.c:785
 msgid "gksu_run needs a command to be run, none was provided."
 msgstr "gksu_run potrebuje príkaz, ktorý ma spustiť, no žiadny nebol zadaný."
 
-#: libgksu/gksu-context.c:778
+#: ../libgksu/libgksu.c:796
 msgid "The gksu-run-helper command was not found or is not executable."
 msgstr "Príkaz gksu-run-helper nebol nájdený alebo nie je spustiteľný."
 
-#: libgksu/gksu-context.c:827 libgksu/gksu-context.c:1376
+#: ../libgksu/libgksu.c:833
 #, c-format
+msgid "Unable to run /bin/su: %s"
+msgstr "Nepodarilo sa spustiť /bin/su: %s"
+
+#: ../libgksu/libgksu.c:844 ../libgksu/libgksu.c:1294
+#, c-format
 msgid "Failed to fork new process: %s"
 msgstr "Nepodarilo sa spustiť nový proces: %s"
 
-#: libgksu/gksu-context.c:909 libgksu/gksu-context.c:1481
+#: ../libgksu/libgksu.c:951 ../libgksu/libgksu.c:1400
 msgid "Wrong password."
 msgstr "Chybné heslo."
 
-#: libgksu/gksu-context.c:935
+#: ../libgksu/libgksu.c:977
 #, c-format
 msgid ""
 "Failed to communicate with gksu-run-helper.\n"
@@ -68,59 +140,72 @@
 " %s"
 msgstr ""
 
-#: libgksu/gksu-context.c:970
+#: ../libgksu/libgksu.c:1012
 #, c-format
 msgid "Could not read from the pipe with the child: %s"
 msgstr "Nemôžem komunikovať z podprocesom: %s"
 
-#: libgksu/gksu-context.c:1014
+#: ../libgksu/libgksu.c:1056
 #, fuzzy, c-format
 msgid "su terminated with %d status"
 msgstr "Podproces skončil so statusom %d"
 
-#: libgksu/gksu-context.c:1234
+#: ../libgksu/libgksu.c:1137
 msgid "gksu_sudo_run needs a command to be run, none was provided."
 msgstr ""
 "gksu_sudo_run potrebuje príkaz, ktorý ma spustiť, no žiadny nebol zadaný."
 
-#: libgksu/gksu-context.c:1245
+#: ../libgksu/libgksu.c:1163
 msgid "Unable to copy the user's Xauthorization file."
 msgstr "Nepodarilo sa mi skopírovať používateľský Xautority súbor."
 
-#: libgksu/gksu-context.c:1357 libgksu/gksu-context.c:1366
+#: ../libgksu/libgksu.c:1275 ../libgksu/libgksu.c:1284
 #, c-format
 msgid "Error creating pipe: %s"
 msgstr "Chyba počas vytvárania komunikačnej rúry: %s"
 
-#: libgksu/gksu-context.c:1392
+#: ../libgksu/libgksu.c:1310
 #, c-format
 msgid "Failed to exec new process: %s"
 msgstr "Nepodarilo sa spustiť proces: %s"
 
-#: libgksu/gksu-context.c:1408 libgksu/gksu-context.c:1418
+#: ../libgksu/libgksu.c:1326 ../libgksu/libgksu.c:1336
 #, c-format
 msgid "Error opening pipe: %s"
 msgstr "Chyba počas otvárania komunikačnej rúry: %s"
 
-#: libgksu/gksu-context.c:1443
-msgid "No password was supplied and sudo needs it."
-msgstr "Nebolo zadané žiadne heslo."
-
-#: libgksu/gksu-context.c:1451
+#: ../libgksu/libgksu.c:1365
 msgid "Password: "
 msgstr ""
 
-#: libgksu/gksu-context.c:1484 libgksu/gksu-context.c:1498
+#: ../libgksu/libgksu.c:1403 ../libgksu/libgksu.c:1417
 msgid ""
 "The underlying authorization mechanism (sudo) does not allow you to run this "
 "program. Contact the system administrator."
 msgstr ""
 
-#: libgksu/gksu-context.c:1550
+#: ../libgksu/libgksu.c:1469
 #, fuzzy, c-format
 msgid "sudo terminated with %d status"
 msgstr "Podproces skončil so statusom %d"
 
+#: ../libgksuui/gksuui-dialog.c:102
+msgid "Continue"
+msgstr ""
+
+#. label
+#: ../libgksuui/gksuui-dialog.c:130
+msgid "<span weight=\"bold\" size=\"larger\">Type the root password.</span>\n"
+msgstr ""
+
+#. entry label
+#: ../libgksuui/gksuui-dialog.c:148
+msgid "Password:"
+msgstr ""
+
+#~ msgid "No password was supplied and sudo needs it."
+#~ msgstr "Nebolo zadané žiadne heslo."
+
 #~ msgid ""
 #~ "The X authority file i am trying to create for the target user already "
 #~ "exists! This is highly suspicous!"




More information about the gksu-commits mailing list