Merge commit 'upstream/0.16.rc2' into experimental

36 files changed, 1350 insertions, 1069 deletions

diff --git a/ChangeLog b/ChangeLog
index e811cac..13c2fe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,224 @@
 # Generated by Makefile. Do not edit.
 
+commit 71809f1d4372da6ba62c2d678063f006746d07cb
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Fri Jun 18 20:55:06 2010 +0200
+
+    Make sure my_creds is properly initialized so freeing doesn't dump core
+
+ src/ka-dialog.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 1eadac644636641ff28e0abe9b6701cecee39dbb
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Fri Jun 18 20:25:23 2010 +0200
+
+    Move free'ing functions together
+
+ src/ka-dialog.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 4743967cb6b3655250b121461812e95934912350
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Fri Jun 18 19:42:46 2010 +0200
+
+    No need to fill opts when we're not using them
+    
+    so ka_set_ticket_options can go too.
+
+ src/ka-dialog.c |   44 --------------------------------------------
+ 1 files changed, 0 insertions(+), 44 deletions(-)
+
+commit e91acf3273856f07a594403109ddc8edbdad651e
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Fri Jun 18 19:37:41 2010 +0200
+
+    Free my_creds unconditionally
+    
+    to avoid leaks.
+
+ src/ka-dialog.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 26c5f6ebd9f205418a159887fbde6cba66623622
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Jun 7 18:51:56 2010 +0200
+
+    Drop Encoding=UTF-8 from desktop file
+
+ src/krb5-auth-dialog.desktop.in |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 88a05524474ebbc363167714246c7c3cfde57463
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Jun 6 19:16:25 2010 +0200
+
+    Handle errors from notify_notification_close
+
+ src/ka-applet.c |   13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 deletions(-)
+
+commit 20f96e0a3c7384feadc29c1ac8b8434743b9fdca
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Jun 6 18:01:23 2010 +0200
+
+    Update file rename in note to translators
+
+ src/dummy-strings.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 379d47bb6deb1771007235408abf2140ca33dd7b
+Author: Petter Reinholdtsen <pere@hungry.com>
+Date:   Sun Jun 6 17:59:12 2010 +0200
+
+    Update nb translation
+
+ po/nb.po |  995 ++++++++++++++++++++++++++++----------------------------------
+ 1 files changed, 450 insertions(+), 545 deletions(-)
+
+commit 7a7832ce3a7c4adffca663fd5298ac76a47abf27
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Jun 6 17:56:38 2010 +0200
+
+    Explain howto create a pot file
+
+ README |   23 +++++++++++++++++------
+ 1 files changed, 17 insertions(+), 6 deletions(-)
+
+commit 5f6d0ea21bc5dab47acd8f478cf866b2dbd084b5
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat Jun 5 16:54:30 2010 +0200
+
+    Check for libnm-glib instead of libnm_glib
+    
+    Debian Bug http://bugs.debian.org/569319
+
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 61cc98a71b711bad8336a9863ca64a2c6d53875a
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat Jun 5 16:21:00 2010 +0200
+
+    Drop -Wstrict-prototypes
+    
+    since the GTK+ header's issue a warning:
+        gtkitemfactory.h:47: warning: function declaration isn’t a prototype
+    making us overlook real erros.
+
+ acinclude.m4 |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5da354a13041ade8f969a78b351294337e131d99
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat Jun 5 15:25:17 2010 +0200
+
+    Unref file monitor
+
+ src/ka-dialog.c |   15 +++++++--------
+ 1 files changed, 7 insertions(+), 8 deletions(-)
+
+commit 6e0435e8b67c845f717f17c7403fb1edf797dfb9
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat Jun 5 14:51:50 2010 +0200
+
+    Use g_warning instead of g_print on gconf errors
+
+ src/ka-gconf-tools.c |   10 +++++-----
+ src/ka-gconf.c       |    4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+commit e3bf7f23494478e5225229ea099edc2f52297c7c
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat Jun 5 14:46:26 2010 +0200
+
+    Use g_clear_error (&error) instead of g_error_free (error)
+    
+    so we don't have to check if error is set.
+
+ preferences/ka-preferences.c |    2 +-
+ src/ka-applet.c              |    4 ++--
+ src/ka-dialog.c              |    5 ++---
+ src/ka-gconf-tools.c         |   10 +++++-----
+ src/ka-gconf.c               |    2 +-
+ src/ka-tools.c               |    2 +-
+ 6 files changed, 12 insertions(+), 13 deletions(-)
+
+commit d4e12192f046c13402a6c258cc669bb13284945f
+Author: Fran Diéguez <fran.dieguez@mabishu.com>
+Date:   Sun May 23 02:39:26 2010 +0200
+
+    Updated Galician translations
+
+ po/gl.po |  159 ++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 99 insertions(+), 60 deletions(-)
+
+commit 510d24160ce166a4b3c6dd31d06dc03594bb4a0a
+Author: Christian.Kirbach <Christian.Kirbach@googlemail.com>
+Date:   Fri May 21 09:43:17 2010 +0200
+
+    Updated German translation
+
+ po/de.po |  131 ++++++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 69 insertions(+), 62 deletions(-)
+
+commit 6fe2410819a2c0e2810065a34430e0e9c638cede
+Author: Matthew L. Dailey <matthew.l.dailey@dartmouth.edu>
+Date:   Sun May 16 16:35:48 2010 +0200
+
+    Don't consider credentials renewable unless the renew_till time is later than the current expiry
+
+ src/ka-dialog.c |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 8a5129030c4bb993a41ed685e653f17579849d33
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat May 8 15:44:10 2010 +0200
+
+    Add gseal-gtk-compat.h from gedit
+    
+    and add missing accessors so we can build gtksecentry with GTK+ down to
+    2.12.
+    
+    See https://bugs.g10code.com/gnupg/issue1224
+
+ gtksecentry/Makefile.am        |    7 ++++-
+ gtksecentry/gseal-gtk-compat.h |   61 ++++++++++++++++++++++++++++++++++++++++
+ gtksecentry/gtksecentry.h      |    1 +
+ 3 files changed, 68 insertions(+), 1 deletions(-)
+
+commit 26633cb549efb6743b115cc95502df6f3475c5cb
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Thu May 6 19:29:29 2010 +0200
+
+    Make gtksecentry -DSEAL safe
+    
+    See https://bugs.g10code.com/gnupg/issue1224
+
+ gtksecentry/gtksecentry.c |  193 ++++++++++++++++++++++++++-------------------
+ 1 files changed, 112 insertions(+), 81 deletions(-)
+
+commit 80e64ae643ecdcf70e08302ba0b3ef52271cc647
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat May 8 14:38:09 2010 +0200
+
+    Make -DSEAL safe
+
+ src/ka-pwdialog.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 85cbdef98a2fcb1d2480db9b0783d08c4efbe889
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Wed May 5 17:51:21 2010 +0200
+
+    Set window_position to center-always
+    
+    so we're centered on the screen instead of ending up in the top left
+    corner.
+
+ src/krb5-auth-dialog.xml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
 commit 9a1e5a769be82454c134ca189a274af13b561d79
 Author: Guido Günther <agx@sigxcpu.org>
 Date:   Tue May 4 07:30:38 2010 +0200
diff --git a/Makefile.in b/Makefile.in
index c46f122..4cbb8a9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -217,6 +217,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/README b/README
index aadbd9f..9eb5bae 100644
--- a/README
+++ b/README
@@ -20,12 +20,6 @@ gconftool-2 --type=string --set /apps/krb5-auth-dialog/pk_userid "FILE:/path/to/
 or if you're using a smartcard:
 gconftool-2 --type=string --set /apps/krb5-auth-dialog/pk_userid "PKCS11:/usr/lib/opensc/opensc-pkcs11.so"
 
-A note on translations:
-Kerberos doesn't translate either its prompts or its error messages.
-As the prompt is very visible, we need to translate it externally.  To
-do this, the etpo binary in etpo/ can be used to extract the public
-strings that kerberos uses.  We are checking that in for now, until
-kerberos gets translated.
 
 DBus API
 ========
@@ -42,6 +36,7 @@ request fails. To request a TGT for the "default" principal use string:''.
 
 See examples/tgt-signals.py for information about sent DBus signals.
 
+
 Plugins
 =======
 Plugins are currently disabled by default. To enable them you have to set the gconf key:
@@ -51,3 +46,19 @@ gconftool-2 --set --list-type=string --type=list  /apps/krb5-auth-dialog/plugins
 
 To list currently enabled plugins:
 gconftool-2 --get --list-type=string  /apps/krb5-auth-dialog/plugins/enabled
+
+
+A Note on Translations
+======================
+Kerberos doesn't translate either its prompts or its error messages.
+As the prompt is very visible, we need to translate it externally.  To
+do this, the etpo binary in etpo/ can be used to extract the public
+strings that kerberos uses.  We are checking that in for now, until
+kerberos gets translated.
+
+If your language doesn't have a translation yet and you want to provide one do a
+
+	cd po; make krb5-auth-dialog.pot
+
+in the unpacked source tree to get a template of translatable strings.
+
diff --git a/acinclude.m4 b/acinclude.m4
index 3c814fb..3301d70 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -121,7 +121,7 @@ dnl taken from libvirt which was
 dnl taken from gnome-common/macros2/gnome-compiler-flags.m4
 dnl
 dnl We've added:
-dnl   -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls
+dnl   -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Winline -Wredundant-decls
 dnl We've removed
 dnl   CFLAGS="$realsave_CFLAGS"
 dnl   to avoid clobbering user-specified CFLAGS
@@ -153,7 +153,7 @@ AC_DEFUN([KA_COMPILE_WARNINGS],[
     maximum|error)
 	try_compiler_flags="-Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
 	try_compiler_flags="$try_compiler_flags -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return"
-	try_compiler_flags="$try_compiler_flags -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare"
+	try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wno-sign-compare"
 	try_compiler_flags="$try_compiler_flags $common_flags"
 	if test "$enable_compile_warnings" = "error" ; then
 	    try_compiler_flags="$try_compiler_flags -Werror"
diff --git a/aclocal.m4 b/aclocal.m4
index b9bac44..e467211 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -8657,8 +8657,9 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
 
-# nls.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8676,20 +8677,21 @@ dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ(2.50)
+AC_PREREQ([2.50])
 
 AC_DEFUN([AM_NLS],
 [
   AC_MSG_CHECKING([whether NLS is requested])
   dnl Default is enabled NLS
-  AC_ARG_ENABLE(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_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
 ])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
@@ -8717,7 +8719,10 @@ AC_DEFUN([AM_NLS],
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
@@ -8730,7 +8735,6 @@ if test -n "$PKG_CONFIG"; then
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
-		
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -8739,34 +8743,31 @@ fi[]dnl
 # Check to see whether a particular set of modules exists.  Similar
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
+  m4_default([$2], [:])
 m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -8808,16 +8809,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	ifelse([$4], , [AC_MSG_ERROR(dnl
+	m4_default([$4], [AC_MSG_ERROR(
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -8825,25 +8827,24 @@ $$1_PKG_ERRORS
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
+_PKG_TEXT])dnl
+        ])
 elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+        ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
+	$3
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
diff --git a/configure b/configure
index 7dc0851..5f47865 100755
--- a/configure
+++ b/configure
@@ -791,6 +791,8 @@ ENABLE_SK_TRUE
 DOC_USER_FORMATS
 OMF_DIR
 HELP_DIR
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 WARN_PYTHON_CFLAGS
 WARN_CFLAGS
@@ -994,6 +996,8 @@ CPP
 YACC
 YFLAGS
 PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 GTK_CFLAGS
 GTK_LIBS
 DBUS_CFLAGS
@@ -1689,6 +1693,10 @@ Some influential environment variables:
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
   PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
   GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
   GTK_LIBS    linker flags for GTK, overriding pkg-config
   DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
@@ -7127,13 +7135,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7130: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7138: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7133: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7141: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7136: output\"" >&5)
+  (eval echo "\"\$as_me:7144: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8338,7 +8346,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8341 "configure"' > conftest.$ac_ext
+  echo '#line 8349 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9596,11 +9604,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9599: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9607: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9603: \$? = $ac_status" >&5
+   echo "$as_me:9611: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9935,11 +9943,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9938: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9946: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9942: \$? = $ac_status" >&5
+   echo "$as_me:9950: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10040,11 +10048,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10043: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10051: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10047: \$? = $ac_status" >&5
+   echo "$as_me:10055: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10095,11 +10103,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10098: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10106: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10102: \$? = $ac_status" >&5
+   echo "$as_me:10110: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12479,7 +12487,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12482 "configure"
+#line 12490 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12575,7 +12583,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12578 "configure"
+#line 12586 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13157,7 +13165,7 @@ fi
     maximum|error)
 	try_compiler_flags="-Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
 	try_compiler_flags="$try_compiler_flags -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return"
-	try_compiler_flags="$try_compiler_flags -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare"
+	try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wno-sign-compare"
 	try_compiler_flags="$try_compiler_flags $common_flags"
 	if test "$enable_compile_warnings" = "error" ; then
 	    try_compiler_flags="$try_compiler_flags -Werror"
@@ -13283,6 +13291,10 @@ $as_echo "yes" >&6; }
 
 
 
+
+
+
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -13395,7 +13407,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
-
 fi
 
 gdu_cv_version_required=0.3.2
@@ -13494,11 +13505,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
 $as_echo_n "checking for GTK... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTK_CFLAGS"; then
-        pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GTK_CFLAGS"; then
+    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
   ac_status=$?
@@ -13508,15 +13518,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GTK_LIBS"; then
-        pkg_cv_GTK_LIBS="$GTK_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GTK_LIBS"; then
+    pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
   ac_status=$?
@@ -13526,14 +13534,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13541,9 +13550,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED" 2>&1`
         else
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
@@ -13557,9 +13566,10 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables GTK_CFLAGS
 and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
@@ -13577,18 +13587,17 @@ else
 	GTK_LIBS=$pkg_cv_GTK_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
 $as_echo_n "checking for DBUS... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$DBUS_CFLAGS"; then
-        pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_CFLAGS"; then
+    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQUIRED") 2>&5
   ac_status=$?
@@ -13598,15 +13607,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$DBUS_LIBS"; then
-        pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_LIBS"; then
+    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQUIRED") 2>&5
   ac_status=$?
@@ -13616,14 +13623,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13631,9 +13639,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQUIRED"`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQUIRED" 2>&1`
         else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQUIRED"`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQUIRED" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DBUS_PKG_ERRORS" >&5
@@ -13647,9 +13655,10 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables DBUS_CFLAGS
 and DBUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
@@ -13667,18 +13676,17 @@ else
 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
 $as_echo_n "checking for GCONF... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GCONF_CFLAGS"; then
-        pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GCONF_CFLAGS"; then
+    pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED") 2>&5
   ac_status=$?
@@ -13688,15 +13696,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GCONF_LIBS"; then
-        pkg_cv_GCONF_LIBS="$GCONF_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GCONF_LIBS"; then
+    pkg_cv_GCONF_LIBS="$GCONF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED") 2>&5
   ac_status=$?
@@ -13706,14 +13712,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13721,9 +13728,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0 >= $GCONF_REQUIRED"`
+	        GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
         else
-	        GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= $GCONF_REQUIRED"`
+	        GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GCONF_PKG_ERRORS" >&5
@@ -13737,9 +13744,10 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables GCONF_CFLAGS
 and GCONF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
@@ -13757,18 +13765,17 @@ else
 	GCONF_LIBS=$pkg_cv_GCONF_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO_UNIX" >&5
 $as_echo_n "checking for GIO_UNIX... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GIO_UNIX_CFLAGS"; then
-        pkg_cv_GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GIO_UNIX_CFLAGS"; then
+    pkg_cv_GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= \$GIO_UNIX_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= $GIO_UNIX_REQUIRED") 2>&5
   ac_status=$?
@@ -13778,15 +13785,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GIO_UNIX_LIBS"; then
-        pkg_cv_GIO_UNIX_LIBS="$GIO_UNIX_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GIO_UNIX_LIBS"; then
+    pkg_cv_GIO_UNIX_LIBS="$GIO_UNIX_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= \$GIO_UNIX_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= $GIO_UNIX_REQUIRED") 2>&5
   ac_status=$?
@@ -13796,14 +13801,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13811,9 +13817,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gio-unix-2.0 >= $GIO_UNIX_REQUIRED"`
+	        GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-unix-2.0 >= $GIO_UNIX_REQUIRED" 2>&1`
         else
-	        GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-unix-2.0 >= $GIO_UNIX_REQUIRED"`
+	        GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-unix-2.0 >= $GIO_UNIX_REQUIRED" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIO_UNIX_PKG_ERRORS" >&5
@@ -13827,9 +13833,10 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables GIO_UNIX_CFLAGS
 and GIO_UNIX_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
@@ -13847,18 +13854,17 @@ else
 	GIO_UNIX_LIBS=$pkg_cv_GIO_UNIX_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5
 $as_echo_n "checking for GIO... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GIO_CFLAGS"; then
-        pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GIO_CFLAGS"; then
+    pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED") 2>&5
   ac_status=$?
@@ -13868,15 +13874,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GIO_LIBS"; then
-        pkg_cv_GIO_LIBS="$GIO_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GIO_LIBS"; then
+    pkg_cv_GIO_LIBS="$GIO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED") 2>&5
   ac_status=$?
@@ -13886,14 +13890,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13901,9 +13906,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gio-2.0 >= $GIO_REQUIRED"`
+	        GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= $GIO_REQUIRED" 2>&1`
         else
-	        GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0 >= $GIO_REQUIRED"`
+	        GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= $GIO_REQUIRED" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIO_PKG_ERRORS" >&5
@@ -13917,9 +13922,10 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables GIO_CFLAGS
 and GIO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
@@ -13937,18 +13943,17 @@ else
 	GIO_LIBS=$pkg_cv_GIO_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5
 $as_echo_n "checking for GMODULE... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GMODULE_CFLAGS"; then
-        pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GMODULE_CFLAGS"; then
+    pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5
   ac_status=$?
@@ -13958,15 +13963,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GMODULE_LIBS"; then
-        pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GMODULE_LIBS"; then
+    pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5
   ac_status=$?
@@ -13976,14 +13979,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13991,9 +13995,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmodule-2.0"`
+	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0" 2>&1`
         else
-	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmodule-2.0"`
+	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GMODULE_PKG_ERRORS" >&5
@@ -14007,9 +14011,10 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables GMODULE_CFLAGS
 and GMODULE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
@@ -14027,7 +14032,7 @@ else
 	GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 
@@ -14424,46 +14429,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5
 $as_echo_n "checking for NETWORK_MANAGER... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$NETWORK_MANAGER_CFLAGS"; then
-        pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm_glib >= 0.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnm_glib >= 0.5") 2>&5
+if test -n "$NETWORK_MANAGER_CFLAGS"; then
+    pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib >= 0.7.999\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnm-glib >= 0.7.999") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "libnm_glib >= 0.5" 2>/dev/null`
+  pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "libnm-glib >= 0.7.999" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$NETWORK_MANAGER_LIBS"; then
-        pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm_glib >= 0.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnm_glib >= 0.5") 2>&5
+if test -n "$NETWORK_MANAGER_LIBS"; then
+    pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib >= 0.7.999\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnm-glib >= 0.7.999") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "libnm_glib >= 0.5" 2>/dev/null`
+  pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "libnm-glib >= 0.7.999" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -14471,17 +14474,17 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnm_glib >= 0.5"`
+	        NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnm-glib >= 0.7.999" 2>&1`
         else
-	        NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnm_glib >= 0.5"`
+	        NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnm-glib >= 0.7.999" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$NETWORK_MANAGER_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                enable_network_manager=no
+	enable_network_manager=no
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	enable_network_manager=no
 else
 	NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
@@ -14525,11 +14528,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
 $as_echo_n "checking for LIBNOTIFY... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBNOTIFY_CFLAGS"; then
-        pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$LIBNOTIFY_CFLAGS"; then
+    pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5
   ac_status=$?
@@ -14539,15 +14541,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBNOTIFY_LIBS"; then
-        pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$LIBNOTIFY_LIBS"; then
+    pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5
   ac_status=$?
@@ -14557,14 +14557,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -14572,15 +14573,13 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= $LIBNOTIFY_REQUIRED"`
+	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
         else
-	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= $LIBNOTIFY_REQUIRED"`
+	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBNOTIFY_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
     if test "x$with_libnotify" = "xcheck" ; then
        with_libnotify=no
@@ -14589,6 +14588,8 @@ $as_echo "no" >&6; }
     fi
 
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
     if test "x$with_libnotify" = "xcheck" ; then
        with_libnotify=no
diff --git a/configure.ac b/configure.ac
index 9d4f39b..48e2e6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,7 +152,7 @@ AC_ARG_ENABLE([network-manager],
 AC_MSG_RESULT([$enable_network_manager])
 
 if test "x$enable_network_manager" != "xno"; then
-	PKG_CHECK_MODULES([NETWORK_MANAGER],[libnm_glib >= 0.5],
+	PKG_CHECK_MODULES([NETWORK_MANAGER],[libnm-glib >= 0.7.999],
 		[enable_network_manager=yes],[enable_network_manager=no])
 	AC_SUBST([NETWORK_MANAGER_CFLAGS])
 	AC_SUBST([NETWORK_MANAGER_LIBS])
diff --git a/etpo/Makefile.in b/etpo/Makefile.in
index ec96b7b..57d4be4 100644
--- a/etpo/Makefile.in
+++ b/etpo/Makefile.in
@@ -207,6 +207,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 4c6785c..9e55a5a 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -160,6 +160,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/gtksecentry/Makefile.am b/gtksecentry/Makefile.am
index 4c15a5a..2daf7ed 100644
--- a/gtksecentry/Makefile.am
+++ b/gtksecentry/Makefile.am
@@ -1,7 +1,12 @@
+NULL =
+
 AM_CPPFLAGS = $(GTK_CFLAGS) \
 	-I$(top_srcdir)/secmem -I$(top_srcdir)/gtksecentry
 
 noinst_LIBRARIES = libgtksecentry.a
 
-libgtksecentry_a_SOURCES = gtksecentry.c gtksecentry.h
+libgtksecentry_a_SOURCES = \
+	gtksecentry.c \
+	gtksecentry.h \
+	gseal-gtk-compat.h
 
diff --git a/gtksecentry/Makefile.in b/gtksecentry/Makefile.in
index 5d13085..f6ce2dc 100644
--- a/gtksecentry/Makefile.in
+++ b/gtksecentry/Makefile.in
@@ -195,6 +195,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -267,11 +269,16 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+NULL = 
 AM_CPPFLAGS = $(GTK_CFLAGS) \
 	-I$(top_srcdir)/secmem -I$(top_srcdir)/gtksecentry
 
 noinst_LIBRARIES = libgtksecentry.a
-libgtksecentry_a_SOURCES = gtksecentry.c gtksecentry.h
+libgtksecentry_a_SOURCES = \
+	gtksecentry.c \
+	gtksecentry.h \
+	gseal-gtk-compat.h
+
 all: all-am
 
 .SUFFIXES:
diff --git a/gtksecentry/gseal-gtk-compat.h b/gtksecentry/gseal-gtk-compat.h
new file mode 100644
index 0000000..bbad970
--- /dev/null
+++ b/gtksecentry/gseal-gtk-compat.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+/*
+ *  Copyright © 2009 Thomas H.P. Andersen <phomes@gmail.com>,
+ *              2009 Javier Jardón <jjardon@gnome.org>
+ *              2010 Guido Günther <agx@sigxcpu.org>
+ *
+ *  This runtime is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2.1, or (at your option)
+ *  any later version.
+ *
+ *  This runtime is distributed in the hope runtime it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this runtime; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GSEAL_GTK_COMPAT_H
+#define GSEAL_GTK_COMPAT_H
+
+G_BEGIN_DECLS
+
+#if !GTK_CHECK_VERSION (2, 20, 0)
+#define gtk_widget_get_realized(widget)                         GTK_WIDGET_REALIZED(widget)
+#define gtk_widget_get_mapped(widget)                           GTK_WIDGET_MAPPED(widget)
+#endif /* GTK < 2.20.0 */
+
+#if !GTK_CHECK_VERSION (2, 18, 0)
+#define gtk_cell_renderer_get_alignment(cell, xalign, yalign)   g_object_get (cell, "xalign", xalign, "yalign", yalign, NULL)
+#define gtk_cell_renderer_get_padding(cell, xpad, ypad)         g_object_get (cell, "xpad", xpad, "ypad", ypad, NULL)
+#define gtk_cell_renderer_set_padding(cell, xpad, ypad)         g_object_set (cell, "xpad", xpad, "ypad", ypad, NULL)
+#define gtk_widget_get_allocation(widget, alloc)                (*(alloc)=(widget)->allocation)
+#define gtk_widget_set_allocation(widget, alloc)                ((widget)->allocation=*(alloc))
+#define gtk_widget_get_app_paintable(widget)                    (GTK_WIDGET_APP_PAINTABLE (widget))
+#define gtk_widget_set_can_default(widget, can_default)         ((can_default) ? (GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT)) : (GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_DEFAULT)))
+#define gtk_widget_set_can_focus(widget, can_focus)             ((can_focus) ? (GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS)) : (GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS)))
+#define gtk_widget_set_double_buffered(widget, double_buffered) ((double_buffered) ? (GTK_WIDGET_SET_FLAGS (widget, GTK_DOUBLE_BUFFERED)) : (GTK_WIDGET_UNSET_FLAGS (widget, GTK_DOUBLE_BUFFERED)))
+#define gtk_widget_is_drawable(widget)                          (GTK_WIDGET_DRAWABLE (widget))
+#define gtk_widget_is_sensitive(widget)                         (GTK_WIDGET_IS_SENSITIVE(widget))
+#define gtk_widget_has_focus(widget)                            (GTK_WIDGET_HAS_FOCUS (widget))
+#define gtk_widget_get_has_window(widget)                       (!GTK_WIDGET_NO_WINDOW (widget))
+#define gtk_widget_get_sensitive(widget)                        (GTK_WIDGET_SENSITIVE(widget))
+#define gtk_widget_get_state(widget)                            ((widget)->state)
+#define gtk_widget_get_visible(widget)                          (GTK_WIDGET_VISIBLE (widget))
+#define gtk_widget_set_window(widget, _window)                  ((widget)->window=_window)
+#define gtk_widget_set_realized(widget, realized)               ((realized) ? (GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED)) : (GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED)))
+#endif /* GTK+ < 2.18.0 */
+
+#if !GTK_CHECK_VERSION (2, 14, 0)
+#define gtk_window_get_default_widget(window)                   ((window)->default_widget)
+#define gtk_widget_get_window(widget)                           ((widget)->window)
+#endif /* GTK+ < 2.14.0 */
+
+G_END_DECLS
+
+#endif /* GSEAL_GTK_COMPAT_H */
+/* ex:ts=8:noet: */
diff --git a/gtksecentry/gtksecentry.c b/gtksecentry/gtksecentry.c
index b024386..177eab8 100644
--- a/gtksecentry/gtksecentry.c
+++ b/gtksecentry/gtksecentry.c
@@ -776,7 +776,7 @@ gtk_secure_entry_get_property(GObject * object,
 static void
 gtk_secure_entry_init(GtkSecureEntry * entry)
 {
-    GTK_WIDGET_SET_FLAGS(entry, GTK_CAN_FOCUS);
+    gtk_widget_set_can_focus (GTK_WIDGET(entry), TRUE);
 
     entry->text_size = MIN_SIZE;
     WITH_SECURE_MEM(entry->text = g_malloc(entry->text_size));
@@ -836,10 +836,13 @@ gtk_secure_entry_realize(GtkWidget * widget)
 {
     GtkSecureEntry *entry;
     GtkEditable *editable;
+    GdkWindow *window;
+    GtkStyle *style;
     GdkWindowAttr attributes;
     gint attributes_mask;
 
-    GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
+    gtk_widget_set_realized (widget, TRUE);
+
     entry = GTK_SECURE_ENTRY(widget);
     editable = GTK_EDITABLE(widget);
 
@@ -864,10 +867,10 @@ gtk_secure_entry_realize(GtkWidget * widget)
     attributes_mask =
 	GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
-    widget->window =
-	gdk_window_new(gtk_widget_get_parent_window(widget), &attributes,
-		       attributes_mask);
-    gdk_window_set_user_data(widget->window, entry);
+    window = gdk_window_new(gtk_widget_get_parent_window(widget),
+		            &attributes, attributes_mask);
+    gtk_widget_set_window (widget, window);
+    gdk_window_set_user_data(window, entry);
 
     get_text_area_size(entry, &attributes.x, &attributes.y,
 		       &attributes.width, &attributes.height);
@@ -878,19 +881,19 @@ gtk_secure_entry_realize(GtkWidget * widget)
     attributes_mask |= GDK_WA_CURSOR;
 
     entry->text_area =
-	gdk_window_new(widget->window, &attributes, attributes_mask);
+	gdk_window_new(window, &attributes, attributes_mask);
     gdk_window_set_user_data(entry->text_area, entry);
 
     gdk_cursor_unref(attributes.cursor);
 
-    widget->style = gtk_style_attach(widget->style, widget->window);
+    style = gtk_widget_get_style (widget);
+    style = gtk_style_attach(style, window);
+    gtk_widget_set_style (widget, style);
 
-    gdk_window_set_background(widget->window,
-			      &widget->style->
-			      base[GTK_WIDGET_STATE(widget)]);
+    gdk_window_set_background(window,
+			      &style->base[gtk_widget_get_state (widget)]);
     gdk_window_set_background(entry->text_area,
-			      &widget->style->
-			      base[GTK_WIDGET_STATE(widget)]);
+			      &style->base[gtk_widget_get_state (widget)]);
 
     gdk_window_show(entry->text_area);
 
@@ -922,6 +925,7 @@ static void
 get_borders(GtkSecureEntry * entry, gint * xborder, gint * yborder)
 {
     GtkWidget *widget = GTK_WIDGET(entry);
+    GtkStyle *style;
     gint focus_width;
     gboolean interior_focus;
 
@@ -929,9 +933,10 @@ get_borders(GtkSecureEntry * entry, gint * xborder, gint * yborder)
 			 "interior-focus", &interior_focus,
 			 "focus-line-width", &focus_width, NULL);
 
+    style = gtk_widget_get_style (widget);
     if (entry->has_frame) {
-	*xborder = widget->style->xthickness;
-	*yborder = widget->style->ythickness;
+	*xborder = style->xthickness;
+	*yborder = style->ythickness;
     } else {
 	*xborder = 0;
 	*yborder = 0;
@@ -948,13 +953,15 @@ gtk_secure_entry_size_request(GtkWidget * widget,
 			      GtkRequisition * requisition)
 {
     GtkSecureEntry *entry = GTK_SECURE_ENTRY(widget);
+    GtkStyle *style;
     PangoFontMetrics *metrics;
     gint xborder, yborder;
     PangoContext *context;
 
+    style = gtk_widget_get_style (widget);
     context = gtk_widget_get_pango_context(widget);
     metrics = pango_context_get_metrics(context,
-					widget->style->font_desc,
+					style->font_desc,
 					pango_context_get_language
 					(context));
 
@@ -993,8 +1000,10 @@ get_text_area_size(GtkSecureEntry * entry,
     gint xborder, yborder;
     GtkRequisition requisition;
     GtkWidget *widget = GTK_WIDGET(entry);
+    GtkAllocation allocation;
 
     gtk_widget_get_child_requisition(widget, &requisition);
+    gtk_widget_get_allocation (GTK_WIDGET(entry), &allocation);
 
     get_borders(entry, &xborder, &yborder);
 
@@ -1005,7 +1014,7 @@ get_text_area_size(GtkSecureEntry * entry,
 	*y = yborder;
 
     if (width)
-	*width = GTK_WIDGET(entry)->allocation.width - xborder * 2;
+	*width = allocation.width - xborder * 2;
 
     if (height)
 	*height = requisition.height - yborder * 2;
@@ -1017,26 +1026,28 @@ get_widget_window_size(GtkSecureEntry * entry,
 {
     GtkRequisition requisition;
     GtkWidget *widget = GTK_WIDGET(entry);
+    GtkAllocation allocation;
 
     gtk_widget_get_child_requisition(widget, &requisition);
+    gtk_widget_get_allocation (GTK_WIDGET(entry), &allocation);
 
     if (x)
-	*x = widget->allocation.x;
+	*x = allocation.x;
 
     if (y) {
 	if (entry->is_cell_renderer)
-	    *y = widget->allocation.y;
+	    *y = allocation.y;
 	else
-	    *y = widget->allocation.y + (widget->allocation.height -
-					 requisition.height) / 2;
+	    *y = allocation.y + (allocation.height -
+				 requisition.height) / 2;
     }
 
     if (width)
-	*width = widget->allocation.width;
+	*width = allocation.width;
 
     if (height) {
 	if (entry->is_cell_renderer)
-	    *height = widget->allocation.height;
+	    *height = allocation.height;
 	else
 	    *height = requisition.height;
     }
@@ -1048,9 +1059,9 @@ gtk_secure_entry_size_allocate(GtkWidget * widget,
 {
     GtkSecureEntry *entry = GTK_SECURE_ENTRY(widget);
 
-    widget->allocation = *allocation;
+    gtk_widget_set_allocation (widget, allocation);
 
-    if (GTK_WIDGET_REALIZED(widget)) {
+    if (gtk_widget_get_realized (widget)) {
 	/* We call gtk_widget_get_child_requisition, since we want (for
 	 * backwards compatibility reasons) the realization here to
 	 * be affected by the usize of the entry, if set
@@ -1059,7 +1070,8 @@ gtk_secure_entry_size_allocate(GtkWidget * widget,
 
 	get_widget_window_size(entry, &x, &y, &width, &height);
 
-	gdk_window_move_resize(widget->window, x, y, width, height);
+	gdk_window_move_resize(gtk_widget_get_window (widget),
+			       x, y, width, height);
 
 	get_text_area_size(entry, &x, &y, &width, &height);
 
@@ -1072,6 +1084,8 @@ gtk_secure_entry_size_allocate(GtkWidget * widget,
 static void
 gtk_secure_entry_draw_frame(GtkWidget * widget)
 {
+    GtkStyle *style;
+    GdkWindow *window;
     gint x = 0, y = 0;
     gint width, height;
     gboolean interior_focus;
@@ -1081,27 +1095,29 @@ gtk_secure_entry_draw_frame(GtkWidget * widget)
 			 "interior-focus", &interior_focus,
 			 "focus-line-width", &focus_width, NULL);
 
-    gdk_drawable_get_size(widget->window, &width, &height);
+    window = gtk_widget_get_window (widget);
+    gdk_drawable_get_size(window, &width, &height);
 
-    if (GTK_WIDGET_HAS_FOCUS(widget) && !interior_focus) {
+    if (gtk_widget_has_focus (widget) && !interior_focus) {
 	x += focus_width;
 	y += focus_width;
 	width -= 2 * focus_width;
 	height -= 2 * focus_width;
     }
 
-    gtk_paint_shadow(widget->style, widget->window,
+    style = gtk_widget_get_style (widget);
+    gtk_paint_shadow(style, window,
 		     GTK_STATE_NORMAL, GTK_SHADOW_IN,
 		     NULL, widget, "entry", x, y, width, height);
 
-    if (GTK_WIDGET_HAS_FOCUS(widget) && !interior_focus) {
+    if (gtk_widget_has_focus (widget) && !interior_focus) {
 	x -= focus_width;
 	y -= focus_width;
 	width += 2 * focus_width;
 	height += 2 * focus_width;
 
-	gtk_paint_focus(widget->style, widget->window,
-			GTK_WIDGET_STATE(widget), NULL, widget, "entry", 0,
+	gtk_paint_focus(style, window,
+			gtk_widget_get_state (widget), NULL, widget, "entry", 0,
 			0, width, height);
     }
 }
@@ -1110,21 +1126,24 @@ static gint
 gtk_secure_entry_expose(GtkWidget * widget, GdkEventExpose * event)
 {
     GtkSecureEntry *entry = GTK_SECURE_ENTRY(widget);
+    GtkStyle *style;
 
-    if (widget->window == event->window)
+    if (gtk_widget_get_window (widget) == event->window)
 	gtk_secure_entry_draw_frame(widget);
     else if (entry->text_area == event->window) {
 	gint area_width, area_height;
 
 	get_text_area_size(entry, NULL, NULL, &area_width, &area_height);
 
-	gtk_paint_flat_box(widget->style, entry->text_area,
-			   GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE,
+
+	style = gtk_widget_get_style (widget);
+	gtk_paint_flat_box(style, entry->text_area,
+			   gtk_widget_get_state (widget), GTK_SHADOW_NONE,
 			   NULL, widget, "entry_bg",
 			   0, 0, area_width, area_height);
 
 	if ((entry->invisible_char != 0) &&
-	    GTK_WIDGET_HAS_FOCUS(widget) &&
+	    gtk_widget_has_focus (widget) &&
 	    entry->selection_bound == entry->current_pos
 	    && entry->cursor_visible)
 	    gtk_secure_entry_draw_cursor(GTK_SECURE_ENTRY(widget));
@@ -1147,7 +1166,7 @@ gtk_secure_entry_button_press(GtkWidget * widget, GdkEventButton * event)
 
     entry->button = event->button;
 
-    if (!GTK_WIDGET_HAS_FOCUS(widget)) {
+    if (!gtk_widget_has_focus (widget)) {
 	entry->in_click = TRUE;
 	gtk_widget_grab_focus(widget);
 	entry->in_click = FALSE;
@@ -1351,7 +1370,7 @@ gtk_secure_entry_grab_focus(GtkWidget * widget)
     GtkSecureEntry *entry = GTK_SECURE_ENTRY(widget);
     gboolean select_on_focus;
 
-    GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_DEFAULT);
+    gtk_widget_set_can_default (widget, TRUE);
     GTK_WIDGET_CLASS(parent_class)->grab_focus(widget);
 
     /* read current select on focus setting from GtkEntry */
@@ -1381,17 +1400,17 @@ gtk_secure_entry_state_changed(GtkWidget * widget,
 			       GtkStateType previous_state G_GNUC_UNUSED)
 {
     GtkSecureEntry *entry = GTK_SECURE_ENTRY(widget);
+    GtkStyle *style;
 
-    if (GTK_WIDGET_REALIZED(widget)) {
-	gdk_window_set_background(widget->window,
-				  &widget->style->
-				  base[GTK_WIDGET_STATE(widget)]);
+    style = gtk_widget_get_style (widget);
+    if (gtk_widget_get_realized (widget)) {
+	gdk_window_set_background(gtk_widget_get_window(widget),
+				  &style->base[gtk_widget_get_state (widget)]);
 	gdk_window_set_background(entry->text_area,
-				  &widget->style->
-				  base[GTK_WIDGET_STATE(widget)]);
+				  &style->base[gtk_widget_get_state (widget)]);
     }
 
-    if (!GTK_WIDGET_IS_SENSITIVE(widget)) {
+    if (!gtk_widget_is_sensitive (widget)) {
 	/* Clear any selection */
 	gtk_editable_select_region(GTK_EDITABLE(entry), entry->current_pos,
 				   entry->current_pos);
@@ -1517,16 +1536,16 @@ static void
 gtk_secure_entry_style_set(GtkWidget * widget, GtkStyle * previous_style)
 {
     GtkSecureEntry *entry = GTK_SECURE_ENTRY(widget);
+    GtkStyle *style;
 
     gtk_secure_entry_recompute(entry);
 
-    if (previous_style && GTK_WIDGET_REALIZED(widget)) {
-	gdk_window_set_background(widget->window,
-				  &widget->style->
-				  base[GTK_WIDGET_STATE(widget)]);
+    style = gtk_widget_get_style (widget);
+    if (previous_style && gtk_widget_get_realized (widget)) {
+	gdk_window_set_background(gtk_widget_get_window (widget),
+				  &style->base[gtk_widget_get_state (widget)]);
 	gdk_window_set_background(entry->text_area,
-				  &widget->style->
-				  base[GTK_WIDGET_STATE(widget)]);
+				  &style->base[gtk_widget_get_state (widget)]);
     }
 }
 
@@ -1879,13 +1898,18 @@ gtk_secure_entry_real_activate(GtkSecureEntry * entry)
     if (entry->activates_default) {
 	toplevel = gtk_widget_get_toplevel(widget);
 	if (GTK_IS_WINDOW(toplevel)) {
+	    GtkWidget *default_widget;
+
 	    window = GTK_WINDOW(toplevel);
+	    if (window)
+		default_widget = gtk_window_get_default_widget (window);
+	    else
+		return;
 
-	    if (window &&
-		widget != window->default_widget &&
-		!(widget == window->focus_widget &&
-		  (!window->default_widget
-		   || !GTK_WIDGET_SENSITIVE(window->default_widget))))
+	    if (widget != default_widget &&
+		!(widget == gtk_window_get_focus (window) &&
+		  (!default_widget
+		   || !gtk_widget_get_sensitive (default_widget))))
 		gtk_window_activate_default(window);
 	}
     }
@@ -2159,7 +2183,7 @@ gtk_secure_entry_create_layout(GtkSecureEntry * entry,
 
 	pango_dir = pango_find_base_dir(entry->text, entry->n_bytes);
 	if (pango_dir == PANGO_DIRECTION_NEUTRAL) {
-	    if (GTK_WIDGET_HAS_FOCUS(widget)) {
+	    if (gtk_widget_has_focus (widget)) {
 		GdkDisplay *display = gtk_widget_get_display(widget);
 		GdkKeymap *keymap = gdk_keymap_get_for_display(display);
 		pango_dir = gdk_keymap_get_direction(keymap);
@@ -2264,24 +2288,24 @@ get_layout_position(GtkSecureEntry * entry, gint * x, gint * y)
 static void
 gtk_secure_entry_draw_text(GtkSecureEntry * entry)
 {
-    GtkWidget *widget;
+    GtkWidget *widget = GTK_WIDGET(entry);
     PangoLayoutLine *line;
+    GtkStyle *style;
 
     if (entry->invisible_char == 0)
 	return;
 
-    if (GTK_WIDGET_DRAWABLE(entry)) {
+    if (gtk_widget_is_drawable (widget)) {
 	PangoLayout *layout = gtk_secure_entry_ensure_layout(entry, TRUE);
 	gint x, y;
 	gint start_pos, end_pos;
 
-	widget = GTK_WIDGET(entry);
-
 	get_layout_position(entry, &x, &y);
 
+	style = gtk_widget_get_style (widget);
 	gdk_draw_layout(entry->text_area,
-			widget->style->text_gc[widget->state], x, y,
-			layout);
+			style->text_gc[gtk_widget_get_state (widget)],
+				       x, y, layout);
 
 	if (gtk_editable_get_selection_bounds
 	    (GTK_EDITABLE(entry), &start_pos, &end_pos)) {
@@ -2304,12 +2328,12 @@ gtk_secure_entry_draw_text(GtkSecureEntry * entry)
 
 	    pango_layout_get_extents(layout, NULL, &logical_rect);
 
-	    if (GTK_WIDGET_HAS_FOCUS(entry)) {
-		selection_gc = widget->style->base_gc[GTK_STATE_SELECTED];
-		text_gc = widget->style->text_gc[GTK_STATE_SELECTED];
+	    if (gtk_widget_has_focus (widget)) {
+		selection_gc = style->base_gc[GTK_STATE_SELECTED];
+		text_gc = style->text_gc[GTK_STATE_SELECTED];
 	    } else {
-		selection_gc = widget->style->base_gc[GTK_STATE_ACTIVE];
-		text_gc = widget->style->text_gc[GTK_STATE_ACTIVE];
+		selection_gc = style->base_gc[GTK_STATE_ACTIVE];
+		text_gc = style->text_gc[GTK_STATE_ACTIVE];
 	    }
 
 	    for (i = 0; i < n_ranges; i++) {
@@ -2362,13 +2386,13 @@ draw_insertion_cursor(GtkSecureEntry * entry,
 static void
 gtk_secure_entry_draw_cursor(GtkSecureEntry * entry)
 {
+    GtkWidget *widget = GTK_WIDGET(entry);
     GdkKeymap *keymap =
 	gdk_keymap_get_for_display(gtk_widget_get_display
-				   (GTK_WIDGET(entry)));
+				   (widget));
     PangoDirection keymap_direction = gdk_keymap_get_direction(keymap);
 
-    if (GTK_WIDGET_DRAWABLE(entry)) {
-	GtkWidget *widget = GTK_WIDGET(entry);
+    if (gtk_widget_is_drawable (widget)) {
 	GdkRectangle cursor_location;
 	gboolean split_cursor;
 
@@ -2426,7 +2450,7 @@ gtk_secure_entry_draw_cursor(GtkSecureEntry * entry)
 static void
 gtk_secure_entry_queue_draw(GtkSecureEntry * entry)
 {
-    if (GTK_WIDGET_REALIZED(entry))
+    if (gtk_widget_get_realized (GTK_WIDGET(entry)))
 	gdk_window_invalidate_rect(entry->text_area, NULL, FALSE);
 }
 
@@ -2515,7 +2539,7 @@ gtk_secure_entry_adjust_scroll(GtkSecureEntry * entry)
     PangoLayoutLine *line;
     PangoRectangle logical_rect;
 
-    if (!GTK_WIDGET_REALIZED(entry))
+    if (!gtk_widget_get_realized (GTK_WIDGET(entry)))
 	return;
 
     gdk_drawable_get_size(entry->text_area, &text_area_width, NULL);
@@ -3105,10 +3129,11 @@ gtk_secure_entry_mnemonic_activate(GtkWidget * widget,
 static gboolean
 cursor_blinks(GtkSecureEntry * entry)
 {
-    GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(entry));
+    GtkWidget *widget = GTK_WIDGET(entry);
+    GtkSettings *settings = gtk_widget_get_settings(widget);
     gboolean blink;
 
-    if (GTK_WIDGET_HAS_FOCUS(entry) &&
+    if (gtk_widget_has_focus (widget) &&
 	entry->selection_bound == entry->current_pos) {
 	g_object_get(settings, "gtk-cursor-blink", &blink, NULL);
 	return blink;
@@ -3130,24 +3155,28 @@ get_cursor_time(GtkSecureEntry * entry)
 static void
 show_cursor(GtkSecureEntry * entry)
 {
+    GtkWidget *widget = GTK_WIDGET(entry);
+
     if (!entry->cursor_visible) {
 	entry->cursor_visible = TRUE;
 
-	if (GTK_WIDGET_HAS_FOCUS(entry)
+	if (gtk_widget_has_focus (widget)
 	    && entry->selection_bound == entry->current_pos)
-	    gtk_widget_queue_draw(GTK_WIDGET(entry));
+	    gtk_widget_queue_draw(widget);
     }
 }
 
 static void
 hide_cursor(GtkSecureEntry * entry)
 {
+    GtkWidget *widget = GTK_WIDGET(entry);
+
     if (entry->cursor_visible) {
 	entry->cursor_visible = FALSE;
 
-	if (GTK_WIDGET_HAS_FOCUS(entry)
+	if (gtk_widget_has_focus (widget)
 	    && entry->selection_bound == entry->current_pos)
-	    gtk_widget_queue_draw(GTK_WIDGET(entry));
+	    gtk_widget_queue_draw(widget);
     }
 }
 
@@ -3158,19 +3187,21 @@ static gint
 blink_cb(gpointer data)
 {
     GtkSecureEntry *entry;
+    GtkWidget *widget;
 
     GDK_THREADS_ENTER();
 
     entry = GTK_SECURE_ENTRY(data);
+    widget = GTK_WIDGET (entry);
 
-    if (!GTK_WIDGET_HAS_FOCUS(entry)) {
+    if (!gtk_widget_has_focus (widget)) {
 	g_warning
 	    ("GtkSecureEntry - did not receive focus-out-event. If you\n"
 	     "connect a handler to this signal, it must return\n"
 	     "FALSE so the entry gets the event as well");
     }
 
-    g_assert(GTK_WIDGET_HAS_FOCUS(entry));
+    g_assert(gtk_widget_has_focus (widget));
     g_assert(entry->selection_bound == entry->current_pos);
 
     if (entry->cursor_visible) {
diff --git a/gtksecentry/gtksecentry.h b/gtksecentry/gtksecentry.h
index 273a4f2..c2d9771 100644
--- a/gtksecentry/gtksecentry.h
+++ b/gtksecentry/gtksecentry.h
@@ -39,6 +39,7 @@
 
 
 #include <gtk/gtk.h>
+#include "gseal-gtk-compat.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/help/Makefile.in b/help/Makefile.in
index d66e50a..5c76aef 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -185,6 +185,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/icons/22x22/Makefile.in b/icons/22x22/Makefile.in
index d23d014..03c63c2 100644
--- a/icons/22x22/Makefile.in
+++ b/icons/22x22/Makefile.in
@@ -184,6 +184,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in
index 3cf1ae4..d4b4d9c 100644
--- a/icons/48x48/Makefile.in
+++ b/icons/48x48/Makefile.in
@@ -184,6 +184,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/icons/Makefile.in b/icons/Makefile.in
index 4cd3dec..791f33d 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -200,6 +200,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in
index 2e56926..f5ac22e 100644
--- a/icons/scalable/Makefile.in
+++ b/icons/scalable/Makefile.in
@@ -184,6 +184,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/plugins/Makefile.in b/plugins/Makefile.in
index a2ca6c5..34ec198 100644
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@@ -232,6 +232,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/po/de.po b/po/de.po
index f8baa70..b981b56 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,17 +12,15 @@
 #
 # Guido Günther <agx@sigxcpu.org>, 2009.
 # Mario Blättermann <mariobl@gnome.org>, 2009, 2010.
-# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009.
-#
+# Christian Kirbach  <Christian.Kirbach@googlemail.com>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: krb5-auth-dialog master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-"
-"auth-dialog&component=general\n"
-"POT-Creation-Date: 2010-04-27 17:51+0000\n"
-"PO-Revision-Date: 2010-05-02 12:11+0100\n"
-"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
-"Language-Team: German <gnome-de@gnome.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-21 09:43+0200\n"
+"PO-Revision-Date: 2010-05-20 16:43+0200\n"
+"Last-Translator: Christian Kirbach  <Christian.Kirbach@googlemail.com>\n"
+"Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,44 +41,44 @@ msgstr "Service-Tickets"
 msgid "_Renew Ticket"
 msgstr "Ticket _erneuern"
 
-#: ../src/krb5-auth-dialog.c:172
+#: ../src/ka-dialog.c:172
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../src/krb5-auth-dialog.c:328
+#: ../src/ka-dialog.c:332
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: ../src/krb5-auth-pwdialog.c:173
+#: ../src/ka-pwdialog.c:174
 #, c-format
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr "Kerberos-Ticket konnte nicht erlangt werden: »%s«"
 
-#: ../src/krb5-auth-pwdialog.c:210 ../src/krb5-auth-applet.c:390
+#: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:390
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
 msgstr[0] "Ihre Anmeldeinformationen laufen in %d Minute ab"
 msgstr[1] "Ihre Anmeldeinformationen laufen in %d Minuten ab"
 
-#: ../src/krb5-auth-pwdialog.c:215 ../src/krb5-auth-applet.c:395
+#: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:395
 msgid "Your credentials have expired"
 msgstr "Anmeldeinformationen abgelaufen"
 
-#: ../src/krb5-auth-pwdialog.c:236
+#: ../src/ka-pwdialog.c:237
 msgid "Please enter your Kerberos password:"
 msgstr "Bitte geben Sie ihr Kerberos-Passwort ein:"
 
-#: ../src/krb5-auth-pwdialog.c:247
+#: ../src/ka-pwdialog.c:248
 #, c-format
 msgid "Please enter the password for '%s':"
 msgstr "Bitte geben Sie das Passwort für »%s« ein:"
 
-#: ../src/krb5-auth-pwdialog.c:267
+#: ../src/ka-pwdialog.c:268
 msgid "The password you entered is invalid"
 msgstr "Das eingegebene Passwort ist nicht gültig"
 
-#: ../src/krb5-auth-pwdialog.c:283
+#: ../src/ka-pwdialog.c:284
 #, c-format
 msgid "%s Error"
 msgstr "%s-Fehler"
@@ -208,8 +206,9 @@ msgstr "Client oder Server hat einen Null-Schlüssel"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_NULL_KEY
 #: ../src/dummy-strings.c:33
+#, fuzzy
 msgid "Ticket is ineligible for postdating"
-msgstr ""
+msgstr "Ticket kommt nicht für ? in Frage"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CANNOT_POSTDATE
 #: ../src/dummy-strings.c:34
@@ -244,7 +243,7 @@ msgstr "KDC unterstützt padata-Typ nicht"
 #. krb5_err.et:krb5:KRB5KDC_ERR_PADATA_TYPE_NOSUPP
 #: ../src/dummy-strings.c:40
 msgid "KDC has no support for transited type"
-msgstr ""
+msgstr "KDC unterstützt transit-Typ nicht"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_TRTYPE_NOSUPP
 #: ../src/dummy-strings.c:41
@@ -400,8 +399,9 @@ msgstr "Unpassender Prüfsummentyp in Nachricht"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_INAPP_CKSUM
 #: ../src/dummy-strings.c:71
+#, fuzzy
 msgid "Policy rejects transited path"
-msgstr ""
+msgstr "Richtlinie lehnt ? ab"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_PATH_NOT_ACCEPTED
 #: ../src/dummy-strings.c:72
@@ -650,7 +650,8 @@ msgstr "Kerberos-Dienst ist unbekannt"
 #: ../src/dummy-strings.c:120
 msgid "Cannot contact any KDC for requested realm"
 msgstr ""
-"Es kann kein KDC des angeforderten Administrationsbereiches kontaktiert werden"
+"Es kann kein KDC des angeforderten Administrationsbereiches kontaktiert "
+"werden"
 
 #. krb5_err.et:krb5:KRB5_KDC_UNREACH
 #: ../src/dummy-strings.c:121
@@ -687,7 +688,7 @@ msgstr "Nachricht ist eine Wiederholung"
 #. krb5_err.et:krb5:KRB5_RC_REPLAY
 #: ../src/dummy-strings.c:128
 msgid "Replay I/O operation failed XXX"
-msgstr ""
+msgstr "Wiederholen der E/A-Operation ist fehlgeschlagen"
 
 #. krb5_err.et:krb5:KRB5_RC_IO
 #: ../src/dummy-strings.c:129
@@ -705,7 +706,7 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_RC_PARSE
 #: ../src/dummy-strings.c:131
 msgid "End-of-file on replay cache I/O"
-msgstr ""
+msgstr "Dateiende erreicht beim Wiederholungs-Zwischenspeicher"
 
 #. krb5_err.et:krb5:KRB5_RC_IO_EOF
 #: ../src/dummy-strings.c:132
@@ -722,7 +723,7 @@ msgstr "Zugriff verweigert im Code des Wiederholungs-Zwischenspeichers"
 #. krb5_err.et:krb5:KRB5_RC_IO_PERM
 #: ../src/dummy-strings.c:134
 msgid "I/O error in replay cache i/o code"
-msgstr ""
+msgstr "E/A-Fehler im Wiederholungs-Zwischenspeicher"
 
 #. krb5_err.et:krb5:KRB5_RC_IO_IO
 #: ../src/dummy-strings.c:135
@@ -750,7 +751,7 @@ msgstr "Ungültiges Format der Übersetzungsdatei des Administrationsbereiches"
 #. krb5_err.et:krb5:KRB5_TRANS_BADFORMAT
 #: ../src/dummy-strings.c:139
 msgid "Can't open/find lname translation database"
-msgstr ""
+msgstr "Die lname-Übersetzungsdatenbank kann nicht gefunden/geöffnet werden"
 
 #. krb5_err.et:krb5:KRB5_LNAME_CANTOPEN
 #: ../src/dummy-strings.c:140
@@ -842,7 +843,7 @@ msgstr "Typ der Schlüsseltabelle ist bereits registriert."
 #. krb5_err.et:krb5:KRB5_KT_TYPE_EXISTS
 #: ../src/dummy-strings.c:157
 msgid "Credentials cache I/O operation failed XXX"
-msgstr ""
+msgstr "Vorgang des Anmeldedaten-Zwischenspeichers ist fehlgeschlagen"
 
 #. krb5_err.et:krb5:KRB5_CC_IO
 #: ../src/dummy-strings.c:158
@@ -950,7 +951,8 @@ msgstr ""
 #: ../src/dummy-strings.c:177
 msgid "Unsupported key table format version number"
 msgstr ""
-"Nicht unterstützte Formatversionsnummer des Schlüsseltabelle-Zwischenspeichers"
+"Nicht unterstützte Formatversionsnummer des Schlüsseltabelle-"
+"Zwischenspeichers"
 
 #. krb5_err.et:krb5:KRB5_KEYTAB_BADVNO
 #: ../src/dummy-strings.c:178
@@ -966,7 +968,7 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_RC_REQUIRED
 #: ../src/dummy-strings.c:180
 msgid "Hostname cannot be canonicalized"
-msgstr ""
+msgstr "Der Rechnername kann nicht kanonisch angegeben werden"
 
 #. krb5_err.et:krb5:KRB5_ERR_BAD_HOSTNAME
 #: ../src/dummy-strings.c:181
@@ -992,8 +994,9 @@ msgstr ""
 
 #. krb5_err.et:krb5:KRB5_REALM_CANT_RESOLVE
 #: ../src/dummy-strings.c:185
+#, fuzzy
 msgid "Requesting ticket can't get forwardable tickets"
-msgstr ""
+msgstr "Angefordertes Ticket ?"
 
 #. krb5_err.et:krb5:KRB5_TKT_NOT_FORWARDABLE
 #: ../src/dummy-strings.c:186
@@ -1043,7 +1046,8 @@ msgstr "Name der Schlüsseltabelle ist zu lang"
 #: ../src/dummy-strings.c:194
 msgid "Key version number for principal in key table is incorrect"
 msgstr ""
-"Versionsnummer des Schlüssels für Principal in Schlüsseltabelle ist fehlerhaft"
+"Versionsnummer des Schlüssels für Principal in Schlüsseltabelle ist "
+"fehlerhaft"
 
 #. krb5_err.et:krb5:KRB5_KT_KVNONOTFOUND
 #: ../src/dummy-strings.c:195
@@ -1431,41 +1435,41 @@ msgid "Bad magic number for GSSAPI QUEUE"
 msgstr "Falsche magische Zahl für GSSAPI QUEUE"
 
 #. Translators: First number is hours, second number is minutes
-#: ../src/krb5-auth-applet.c:386
+#: ../src/ka-applet.c:386
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "Anmeldeinformationen laufen in %.2d:%.2dh ab."
 
-#: ../src/krb5-auth-applet.c:491
+#: ../src/ka-applet.c:491
 msgid "Don't show me this again"
 msgstr "Dies nicht mehr anzeigen"
 
-#: ../src/krb5-auth-applet.c:533
+#: ../src/ka-applet.c:533
 msgid "Network credentials valid"
 msgstr "Anmeldeinformationen sind gültig"
 
-#: ../src/krb5-auth-applet.c:534
+#: ../src/ka-applet.c:534
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Sie haben Ihre Kerberos-Anmeldeinformationen erneuert."
 
-#: ../src/krb5-auth-applet.c:550
+#: ../src/ka-applet.c:550
 msgid "Network credentials expiring"
 msgstr "Anmeldeinformationen laufen ab"
 
-#: ../src/krb5-auth-applet.c:569
+#: ../src/ka-applet.c:569
 msgid "Network credentials expired"
 msgstr "Anmeldeinformationen abgelaufen"
 
-#: ../src/krb5-auth-applet.c:570
+#: ../src/ka-applet.c:570
 msgid "Your Kerberos credentails have expired."
 msgstr "Ihre Kerberos-Anmeldeinformationen sind abgelaufen."
 
-#: ../src/krb5-auth-applet.c:615
+#: ../src/ka-applet.c:615
 #, c-format
 msgid "There was an error launching the preferences dialog: %s"
 msgstr "Fehler beim Öffnen des Einstellungsdialogs: %s"
 
-#: ../src/krb5-auth-applet.c:656
+#: ../src/ka-applet.c:656
 #, c-format
 msgid ""
 "There was an error displaying %s:\n"
@@ -1475,7 +1479,7 @@ msgstr ""
 "%s"
 
 #. Translators: add the translators of your language here
-#: ../src/krb5-auth-applet.c:692
+#: ../src/ka-applet.c:692
 msgid "translator-credits"
 msgstr ""
 "Guido Günther <agx@sigxcpu.org>\n"
@@ -1483,11 +1487,11 @@ msgstr ""
 "Christian Kirbach <Christian.Kirbach@googlemail.com>"
 
 #. kdestroy
-#: ../src/krb5-auth-applet.c:734
+#: ../src/ka-applet.c:734
 msgid "Remove Credentials _Cache"
 msgstr "_Anmeldeinformationen löschen"
 
-#: ../src/krb5-auth-tools.c:45
+#: ../src/ka-tools.c:45
 #, c-format
 msgid ""
 "There was an error displaying help:\n"
@@ -1496,31 +1500,31 @@ msgstr ""
 "Fehler beim Anzeigen der Hilfe:\n"
 "%s"
 
-#: ../src/krb5-auth-tickets.c:54
+#: ../src/ka-tickets.c:54
 msgid "Principal"
 msgstr "Principal"
 
-#: ../src/krb5-auth-tickets.c:60
+#: ../src/ka-tickets.c:60
 msgid "Start Time"
 msgstr "Startzeit"
 
-#: ../src/krb5-auth-tickets.c:66
+#: ../src/ka-tickets.c:66
 msgid "End Time"
 msgstr "Endzeit"
 
-#: ../src/krb5-auth-tickets.c:72
+#: ../src/ka-tickets.c:72
 msgid "Fwd"
-msgstr ""
+msgstr "Weiterleiten"
 
-#: ../src/krb5-auth-tickets.c:78
+#: ../src/ka-tickets.c:78
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/krb5-auth-tickets.c:84
+#: ../src/ka-tickets.c:84
 msgid "Renew"
 msgstr "Erneuern"
 
-#: ../src/krb5-auth-tickets.c:107
+#: ../src/ka-tickets.c:107
 msgid "Error displaying service ticket information"
 msgstr "Fehler beim Anzeigen der Informationen des Tickets des Dienstes"
 
@@ -1568,7 +1572,7 @@ msgstr "PKINIT-Bezeichner"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:10
 msgid "PKINIT trust anchors"
-msgstr ""
+msgstr "PKINIT Vertrauensinstitutionen"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:11
 msgid "Prompt minutes before expiry"
@@ -1576,7 +1580,7 @@ msgstr "Minuten vor Ablauf nachfragen"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:12
 msgid "Proxiable ticket"
-msgstr ""
+msgstr "Proxy-fähiges Ticket"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:13
 msgid "Renewable ticket"
@@ -1584,15 +1588,15 @@ msgstr "Erneuerbares Ticket"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:14
 msgid "Requested tickets should be forwardable"
-msgstr ""
+msgstr "Angeforderte Tickets sollten weiterleitbar sein"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:15
 msgid "Requested tickets should be proxiable"
-msgstr ""
+msgstr "Angeforderte Tickets sollten proxy-fähig sein"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:16
 msgid "Requested tickets should be renewable"
-msgstr ""
+msgstr "Angeforderte Tickets sollten erneuerbar sein"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:17
 msgid "Show a trayicon in the status area of the panel"
@@ -1603,7 +1607,8 @@ msgid "Show trayicon"
 msgstr "Benachrichtigungssymbol anzeigen"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:19
-msgid "Start prompting/displaying notifications that many minutes before expiry"
+msgid ""
+"Start prompting/displaying notifications that many minutes before expiry"
 msgstr "So viele Minuten vor Ablauf benachrichtigen/anzeigen"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:20
@@ -1631,16 +1636,18 @@ msgstr "Benachrichtigung über gültiges Ticket"
 #, c-format
 msgid "Warning: running q-agent setuid on this system is dangerous\n"
 msgstr ""
+"Warnung: q-agent mit Admistratorrechten auszuführen ist auf diesem System "
+"gefährlich\n"
 
-#: ../preferences/krb5-auth-dialog-preferences.c:345
+#: ../preferences/ka-preferences.c:345
 msgid "Choose Certificate"
 msgstr "Zertifikat wählen"
 
-#: ../preferences/krb5-auth-dialog-preferences.c:361
+#: ../preferences/ka-preferences.c:361
 msgid "X509 Certificates"
 msgstr "X509-Zertifikate"
 
-#: ../preferences/krb5-auth-dialog-preferences.c:365
+#: ../preferences/ka-preferences.c:365
 msgid "all files"
 msgstr "Alle Dateien"
 
@@ -1679,8 +1686,8 @@ msgstr "Legt fest, ob erneuerbare Tickets angefordert werden sollen"
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:8
 msgid "If checked, use a security token (Smartcard) to authenticate."
 msgstr ""
-"Legt fest, ob ein Sicherheits-Token (Smartcard) zur Identifizierung verwendet "
-"wird"
+"Legt fest, ob ein Sicherheits-Token (Smartcard) zur Identifizierung "
+"verwendet wird"
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:9
 msgid "Kerberos"
@@ -1741,7 +1748,7 @@ msgstr "Warnen"
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:23
 msgid "X509 trust anchors:"
-msgstr ""
+msgstr "X509 Vertrauensinstitution:"
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:24
 msgid "_Browse..."
diff --git a/po/gl.po b/po/gl.po
index e35d4df..151f8b6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4,18 +4,20 @@
 # Galician translation of krb5-auth-dialog.
 # Copyright (C) 2009 krb5-auth-dialog's COPYRIGHT HOLDER
 # This file is distributed under the same license as the krb5-auth-dialog package.
+# Fran Diéguez <frandieguez@ubuntu.com>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: krb5-auth-dialog.po.master.gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-15 23:17+0200\n"
-"PO-Revision-Date: 2009-09-07 14:52+0100\n"
-"Last-Translator: Fran Diéguez <fran.dieguez@glug.es>\n"
-"Language-Team: Galician <gnome@mancomun.org>\n"
+"POT-Creation-Date: 2010-05-23 02:39+0200\n"
+"PO-Revision-Date: 2010-05-23 02:38+0200\n"
+"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
+"Language-Team: Galician <gnome@g11.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\\\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../src/krb5-auth-dialog.xml.h:1 ../src/krb5-auth-dialog.desktop.in.h:2
@@ -24,52 +26,55 @@ msgid "Network Authentication"
 msgstr "Autenticación de rede"
 
 #: ../src/krb5-auth-dialog.xml.h:2
-#, fuzzy
 msgid "Service Tickets"
-msgstr "_Anovar tícket"
+msgstr "Tiquets de servicio"
 
 #: ../src/krb5-auth-dialog.xml.h:3
 msgid "_Renew Ticket"
 msgstr "_Anovar tícket"
 
-#: ../src/krb5-auth-dialog.c:160
-#, fuzzy
+#: ../src/ka-dialog.c:172
 msgid "unknown error"
-msgstr "Erro xenérico descoñecido de RC"
+msgstr "erro descoñecido"
 
-#: ../src/krb5-auth-dialog.c:311
+#: ../src/ka-dialog.c:332
 msgid "Expired"
-msgstr ""
+msgstr "Caducado"
 
-#: ../src/krb5-auth-pwdialog.c:165
+#: ../src/ka-pwdialog.c:174
 #, c-format
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr "No se puido obter o tícket de Kerberos: '%s'"
 
-#: ../src/krb5-auth-pwdialog.c:202 ../src/krb5-auth-applet.c:359
+#: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:390
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
 msgstr[0] "As súas credenciais caducan dentro de %d minuto"
 msgstr[1] "As súas credenciais caducan dentro de %d minutos"
 
-#: ../src/krb5-auth-pwdialog.c:207 ../src/krb5-auth-applet.c:364
+#: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:395
 msgid "Your credentials have expired"
 msgstr "As súas credenciais caducaron"
 
-#: ../src/krb5-auth-pwdialog.c:228
+#: ../src/ka-pwdialog.c:237
 msgid "Please enter your Kerberos password:"
 msgstr "Introduza o seu contrasinal de Kerberos:"
 
-#: ../src/krb5-auth-pwdialog.c:239
+#: ../src/ka-pwdialog.c:248
 #, c-format
 msgid "Please enter the password for '%s':"
 msgstr "Introduza o contrasinal para '%s':"
 
-#: ../src/krb5-auth-pwdialog.c:259
+#: ../src/ka-pwdialog.c:268
 msgid "The password you entered is invalid"
 msgstr "O contrasinal que introduciu non é válido"
 
+#: ../src/ka-pwdialog.c:284
+#, c-format
+msgid "%s Error"
+msgstr "Erro %s"
+
 #. Translators: files from dummy-strings.c are *all* possible errors
 #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in
 #. doubt please translate strings from files starting with krb5-auth
@@ -1386,43 +1391,41 @@ msgid "Bad magic number for GSSAPI QUEUE"
 msgstr "Número máxico incorrecto para GSSAPI QUEUE"
 
 #. Translators: First number is hours, second number is minutes
-#: ../src/krb5-auth-applet.c:355
+#: ../src/ka-applet.c:386
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "As súas credenciais caducan en %.2d:%.2dh"
 
-#: ../src/krb5-auth-applet.c:460
+#: ../src/ka-applet.c:491
 msgid "Don't show me this again"
 msgstr "Non mostrar esta mensaxe de novo"
 
-#: ../src/krb5-auth-applet.c:497
+#: ../src/ka-applet.c:533
 msgid "Network credentials valid"
 msgstr "As credenciais de rede son válidas"
 
-#: ../src/krb5-auth-applet.c:498
+#: ../src/ka-applet.c:534
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Actualizou as súas credenciais Kerberos."
 
-#: ../src/krb5-auth-applet.c:511
+#: ../src/ka-applet.c:550
 msgid "Network credentials expiring"
 msgstr "As credenciais de rede van caducar"
 
-#: ../src/krb5-auth-applet.c:526
+#: ../src/ka-applet.c:569
 msgid "Network credentials expired"
 msgstr "As credenciais de rede caducaron"
 
-#: ../src/krb5-auth-applet.c:527
+#: ../src/ka-applet.c:570
 msgid "Your Kerberos credentails have expired."
 msgstr "As súas credenciais Kerberos caducaron."
 
-#: ../src/krb5-auth-applet.c:570
-#, fuzzy, c-format
+#: ../src/ka-applet.c:615
+#, c-format
 msgid "There was an error launching the preferences dialog: %s"
-msgstr ""
-"Ocorreu un erro ao mostrar a axuda:\n"
-"%s"
+msgstr "Produciuse un erro ao iniciar o diálogo de preferencias: %s"
 
-#: ../src/krb5-auth-applet.c:611
+#: ../src/ka-applet.c:656
 #, c-format
 msgid ""
 "There was an error displaying %s:\n"
@@ -1432,18 +1435,18 @@ msgstr ""
 "%s"
 
 #. Translators: add the translators of your language here
-#: ../src/krb5-auth-applet.c:647
+#: ../src/ka-applet.c:692
 msgid "translator-credits"
 msgstr ""
 "Antón Méixome <meixome@mancomun.org> para Mancomún. Centro de Referencia de "
 "Software Libre "
 
 #. kdestroy
-#: ../src/krb5-auth-applet.c:689
+#: ../src/ka-applet.c:734
 msgid "Remove Credentials _Cache"
 msgstr "Quitar a _caché de credenciais"
 
-#: ../src/krb5-auth-tools.c:45
+#: ../src/ka-tools.c:45
 #, c-format
 msgid ""
 "There was an error displaying help:\n"
@@ -1452,97 +1455,133 @@ msgstr ""
 "Ocorreu un erro ao mostrar a axuda:\n"
 "%s"
 
+#: ../src/ka-tickets.c:54
+msgid "Principal"
+msgstr "Principal"
+
+#: ../src/ka-tickets.c:60
+msgid "Start Time"
+msgstr "Tempo de inicio"
+
+#: ../src/ka-tickets.c:66
+msgid "End Time"
+msgstr "Tempo de finalización"
+
+#: ../src/ka-tickets.c:72
+msgid "Fwd"
+msgstr "Rnv"
+
+#: ../src/ka-tickets.c:78
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../src/ka-tickets.c:84
+msgid "Renew"
+msgstr "Renovar"
+
+#: ../src/ka-tickets.c:107
+msgid "Error displaying service ticket information"
+msgstr "Produciuse un erro ao mostrar a información do tiquet de servizo"
+
 #: ../src/krb5-auth-dialog.desktop.in.h:1
 msgid "Kerberos Network Authentication Dialog"
 msgstr "Diálogo de autenticación de rede de Kerberos"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:1
+msgid "Enabled plugins"
+msgstr "Engadidos activados"
+
+#: ../src/krb5-auth-dialog.schemas.in.h:2
 msgid "Forwardable ticket"
 msgstr "Tícket reenviábel"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:2
+#: ../src/krb5-auth-dialog.schemas.in.h:3
 msgid "Kerberos principal"
 msgstr "Principal de Kerberos"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:3
+#: ../src/krb5-auth-dialog.schemas.in.h:4
+msgid "List of plugins that should be loaded and activated on startup."
+msgstr "Lista de engadidos que se debería cargar e activar ao inicio."
+
+#: ../src/krb5-auth-dialog.schemas.in.h:5
 msgid "Notify user when ticket becomes valid"
 msgstr "Notificarlle ao usuario cando un tícket se convirta en válido"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:4
+#: ../src/krb5-auth-dialog.schemas.in.h:6
 msgid "Notify user when ticket has expired"
 msgstr "Notificarlle ao usuario cando un tícket caducou"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:5
+#: ../src/krb5-auth-dialog.schemas.in.h:7
 msgid "Notify user when ticket is about to expire"
 msgstr "Notificarlle ao usuario cando un tícket vai caducar"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:6
+#: ../src/krb5-auth-dialog.schemas.in.h:8
 msgid "PKINIT CA certificates"
 msgstr "Certificados PKINIT CA"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:7
+#: ../src/krb5-auth-dialog.schemas.in.h:9
 msgid "PKINIT identifier"
 msgstr "Identificador PKINT"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:8
+#: ../src/krb5-auth-dialog.schemas.in.h:10
 msgid "PKINIT trust anchors"
 msgstr "Áncoras de confianza de PKINIT"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:9
+#: ../src/krb5-auth-dialog.schemas.in.h:11
 msgid "Prompt minutes before expiry"
 msgstr "Mostrar minutos antes de caducar"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:10
+#: ../src/krb5-auth-dialog.schemas.in.h:12
 msgid "Proxiable ticket"
 msgstr "Tícket utilizábel vía proxy"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:11
+#: ../src/krb5-auth-dialog.schemas.in.h:13
 msgid "Renewable ticket"
 msgstr "Tícket anovábel"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:12
+#: ../src/krb5-auth-dialog.schemas.in.h:14
 msgid "Requested tickets should be forwardable"
 msgstr "Os tíckets solicitados deberán ser reenviábeis"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:13
+#: ../src/krb5-auth-dialog.schemas.in.h:15
 msgid "Requested tickets should be proxiable"
 msgstr "Os tíckets solicitados deberían ser utilizábeis vía proxy"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:14
+#: ../src/krb5-auth-dialog.schemas.in.h:16
 msgid "Requested tickets should be renewable"
 msgstr "Os tíckets solicitados deberían ser anovábeis"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:15
+#: ../src/krb5-auth-dialog.schemas.in.h:17
 msgid "Show a trayicon in the status area of the panel"
 msgstr "Mostrar unha icona na bandexa do sistema na área do panel"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:16
+#: ../src/krb5-auth-dialog.schemas.in.h:18
 msgid "Show trayicon"
 msgstr "Mostrar a icona na bandexa"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:17
+#: ../src/krb5-auth-dialog.schemas.in.h:19
 msgid ""
 "Start prompting/displaying notifications that many minutes before expiry"
 msgstr "Deixar de mostrar notificacións eses minutos antes de que caduque"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:18
+#: ../src/krb5-auth-dialog.schemas.in.h:20
 msgid "The kerberos principal to acquire the ticket for"
 msgstr "O principal de Kerberos para o que adquirir o tícket"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:19
+#: ../src/krb5-auth-dialog.schemas.in.h:21
 msgid "The principal's public/private/certificate identifier when using PKINIT"
 msgstr ""
 "O identificador público/privado/certificado do principal ao usar PKINIT"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:20
+#: ../src/krb5-auth-dialog.schemas.in.h:22
 msgid "ticket expired notification"
 msgstr "notificación de tícket caducado"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:21
+#: ../src/krb5-auth-dialog.schemas.in.h:23
 msgid "ticket expiring notification"
 msgstr "notificación de caducidade de tícket"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:22
+#: ../src/krb5-auth-dialog.schemas.in.h:24
 msgid "valid ticket notification"
 msgstr "tícket de notificación válido"
 
@@ -1551,15 +1590,15 @@ msgstr "tícket de notificación válido"
 msgid "Warning: running q-agent setuid on this system is dangerous\n"
 msgstr "Advertencia: executar q-agent setuid neste sistema é perigoso\n"
 
-#: ../preferences/krb5-auth-dialog-preferences.c:345
+#: ../preferences/ka-preferences.c:345
 msgid "Choose Certificate"
 msgstr "Seleccione o certificado"
 
-#: ../preferences/krb5-auth-dialog-preferences.c:361
+#: ../preferences/ka-preferences.c:361
 msgid "X509 Certificates"
 msgstr "Certificados X509"
 
-#: ../preferences/krb5-auth-dialog-preferences.c:365
+#: ../preferences/ka-preferences.c:365
 msgid "all files"
 msgstr "todos os ficheiros"
 
@@ -1676,11 +1715,11 @@ msgstr "minutos antes de que caduque"
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:28
 msgid "proxiable"
-msgstr "utilizábel vía proxy"
+msgstr "vía proxy"
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:29
 msgid "renewable"
-msgstr "anovábel"
+msgstr "renovábel"
 
 #~ msgid "Cursor Position"
 #~ msgstr "Posición do cursor"
diff --git a/po/nb.po b/po/nb.po
index 3da6416..c011456 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,1440 +1,1475 @@
-# Norwegian bokmål translation of krb5-auth-dialog
+# translation of nb.po to Norwegian Bokmål
+# Norwegian bokmål translation of krb5-auth-dialog
 # Copyright (C) 2005 Red Hat, Inc.
 # This file is distributed under the same license as the krb5-auth-dialog package.
-# Kjartan Maraas <kmaraas@gnome.org>, 2005-2007.
 #
+# Kjartan Maraas <kmaraas@gnome.org>, 2005-2007.
+# Petter Reinholdtsen <pere@hungry.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: krb5-auth-dialog 0.5\n"
+"Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-12 22:46+0200\n"
-"PO-Revision-Date: 2007-11-02 13:30+0100\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"POT-Creation-Date: 2010-05-21 09:43+0200\n"
+"PO-Revision-Date: 2010-06-05 17:11MET\n"
+"Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: ../src/krb5-auth-dialog.xml.h:1 ../src/krb5-auth-dialog.c:53
-#: ../src/krb5-auth-dialog.desktop.in.h:2
+#: ../src/krb5-auth-dialog.xml.h:1 ../src/krb5-auth-dialog.desktop.in.h:2
 #: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:1
 msgid "Network Authentication"
 msgstr "Nettverksautentisering"
 
 #: ../src/krb5-auth-dialog.xml.h:2
 #, fuzzy
+msgid "Service Tickets"
+msgstr "Fo_rny billett"
+
+#: ../src/krb5-auth-dialog.xml.h:3
 msgid "_Renew Ticket"
 msgstr "Fo_rny billett"
 
-#: ../src/krb5-auth-dialog.c:820
+#: ../src/ka-dialog.c:172
+msgid "unknown error"
+msgstr "ukjent feil"
+
+#: ../src/ka-dialog.c:332
+msgid "Expired"
+msgstr "Utgått"
+
+#: ../src/ka-pwdialog.c:174
 #, c-format
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr ""
 
-#: ../src/krb5-auth-pwdialog.c:173 ../src/krb5-auth-applet.c:357
+#: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:390
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
-msgstr[0] "Påloggingsinformasjonen utløper om %d minutt"
-msgstr[1] "Påloggingsinformasjonen utløper om %d minutter"
+msgstr[0] "Påloggingsinformasjonen utløper om %d minutt"
+msgstr[1] "Påloggingsinformasjonen utløper om %d minutter"
 
-#: ../src/krb5-auth-pwdialog.c:178 ../src/krb5-auth-applet.c:362
+#: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:395
 msgid "Your credentials have expired"
-msgstr "Påloggingsinformasjonen har gått ut"
+msgstr "Påloggingsinformasjonen har gått ut"
 
-#: ../src/krb5-auth-pwdialog.c:199
-#, fuzzy
+#: ../src/ka-pwdialog.c:237
 msgid "Please enter your Kerberos password:"
-msgstr "Vennligst skriv inn ditt Kerberos-passord."
+msgstr "Vennligst skriv inn ditt Kerberos-passord:"
 
-#: ../src/krb5-auth-pwdialog.c:210
-#, fuzzy, c-format
+#: ../src/ka-pwdialog.c:248
+#, c-format
 msgid "Please enter the password for '%s':"
-msgstr "Vennligst oppgi passord for «%s»"
+msgstr "Vennligst oppgi passord for «%s»:"
 
-#: ../src/krb5-auth-pwdialog.c:230
+#: ../src/ka-pwdialog.c:268
 msgid "The password you entered is invalid"
 msgstr "Passordet du oppga er ugyldig"
 
-#: ../src/dummy-strings.c:5
+#: ../src/ka-pwdialog.c:284
+#, c-format
+msgid "%s Error"
+msgstr "%s-Feil"
+
+#. Translators: files from dummy-strings.c are *all* possible errors
+#. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in
+#. doubt please translate strings from files starting with krb5-auth
+#. first since these are the ones the user will see in any case.
+#: ../src/dummy-strings.c:10
 msgid "ASN.1 failed call to system time library"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_BAD_TIMEFORMAT
-#: ../src/dummy-strings.c:6
+#: ../src/dummy-strings.c:11
 msgid "ASN.1 structure is missing a required field"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_MISSING_FIELD
-#: ../src/dummy-strings.c:7
+#: ../src/dummy-strings.c:12
 msgid "ASN.1 unexpected field number"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_MISPLACED_FIELD
-#: ../src/dummy-strings.c:8
+#: ../src/dummy-strings.c:13
 msgid "ASN.1 type numbers are inconsistent"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_TYPE_MISMATCH
-#: ../src/dummy-strings.c:9
+#: ../src/dummy-strings.c:14
 msgid "ASN.1 value too large"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_OVERFLOW
-#: ../src/dummy-strings.c:10
+#: ../src/dummy-strings.c:15
 msgid "ASN.1 encoding ended unexpectedly"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_OVERRUN
-#: ../src/dummy-strings.c:11
+#: ../src/dummy-strings.c:16
 msgid "ASN.1 identifier doesn't match expected value"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_BAD_ID
-#: ../src/dummy-strings.c:12
+#: ../src/dummy-strings.c:17
 msgid "ASN.1 length doesn't match expected value"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_BAD_LENGTH
-#: ../src/dummy-strings.c:13
+#: ../src/dummy-strings.c:18
 msgid "ASN.1 badly-formatted encoding"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_BAD_FORMAT
-#: ../src/dummy-strings.c:14
+#: ../src/dummy-strings.c:19
 msgid "ASN.1 parse error"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_PARSE_ERROR
-#: ../src/dummy-strings.c:15
+#: ../src/dummy-strings.c:20
 msgid "ASN.1 bad return from gmtime"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_BAD_GMTIME
-#: ../src/dummy-strings.c:16
+#: ../src/dummy-strings.c:21
 msgid "ASN.1 non-constructed indefinite encoding"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_MISMATCH_INDEF
-#: ../src/dummy-strings.c:17
+#: ../src/dummy-strings.c:22
 msgid "ASN.1 missing expected EOC"
 msgstr ""
 
 #. asn1_err.et:asn1:ASN1_MISSING_EOC
-#: ../src/dummy-strings.c:18
+#: ../src/dummy-strings.c:23
 msgid "No error"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_NONE
-#: ../src/dummy-strings.c:19
+#: ../src/dummy-strings.c:24
 msgid "Client's entry in database has expired"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_NAME_EXP
-#: ../src/dummy-strings.c:20
+#: ../src/dummy-strings.c:25
 msgid "Server's entry in database has expired"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_EXP
-#: ../src/dummy-strings.c:21
+#: ../src/dummy-strings.c:26
 msgid "Requested protocol version not supported"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_BAD_PVNO
-#: ../src/dummy-strings.c:22
+#: ../src/dummy-strings.c:27
 msgid "Client's key is encrypted in an old master key"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_C_OLD_MAST_KVNO
-#: ../src/dummy-strings.c:23
+#: ../src/dummy-strings.c:28
 msgid "Server's key is encrypted in an old master key"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_S_OLD_MAST_KVNO
-#: ../src/dummy-strings.c:24
+#: ../src/dummy-strings.c:29
 msgid "Client not found in Kerberos database"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN
-#: ../src/dummy-strings.c:25
+#: ../src/dummy-strings.c:30
 msgid "Server not found in Kerberos database"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN
-#: ../src/dummy-strings.c:26
+#: ../src/dummy-strings.c:31
 msgid "Principal has multiple entries in Kerberos database"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE
-#: ../src/dummy-strings.c:27
+#: ../src/dummy-strings.c:32
 msgid "Client or server has a null key"
-msgstr ""
+msgstr "Klient eller tjener har en tom nøkkel"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_NULL_KEY
-#: ../src/dummy-strings.c:28
+#: ../src/dummy-strings.c:33
 msgid "Ticket is ineligible for postdating"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CANNOT_POSTDATE
-#: ../src/dummy-strings.c:29
+#: ../src/dummy-strings.c:34
 msgid "Requested effective lifetime is negative or too short"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_NEVER_VALID
-#: ../src/dummy-strings.c:30
+#: ../src/dummy-strings.c:35
 msgid "KDC policy rejects request"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_POLICY
-#: ../src/dummy-strings.c:31
+#: ../src/dummy-strings.c:36
 msgid "KDC can't fulfill requested option"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_BADOPTION
-#: ../src/dummy-strings.c:32
+#: ../src/dummy-strings.c:37
 msgid "KDC has no support for encryption type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_ETYPE_NOSUPP
-#: ../src/dummy-strings.c:33
+#: ../src/dummy-strings.c:38
 msgid "KDC has no support for checksum type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_SUMTYPE_NOSUPP
-#: ../src/dummy-strings.c:34
+#: ../src/dummy-strings.c:39
 msgid "KDC has no support for padata type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_PADATA_TYPE_NOSUPP
-#: ../src/dummy-strings.c:35
+#: ../src/dummy-strings.c:40
 msgid "KDC has no support for transited type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_TRTYPE_NOSUPP
-#: ../src/dummy-strings.c:36
+#: ../src/dummy-strings.c:41
 msgid "Clients credentials have been revoked"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_REVOKED
-#: ../src/dummy-strings.c:37
+#: ../src/dummy-strings.c:42
 msgid "Credentials for server have been revoked"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_REVOKED
-#: ../src/dummy-strings.c:38
+#: ../src/dummy-strings.c:43
 msgid "TGT has been revoked"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_TGT_REVOKED
-#: ../src/dummy-strings.c:39
+#: ../src/dummy-strings.c:44
 msgid "Client not yet valid - try again later"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NOTYET
-#: ../src/dummy-strings.c:40
+#: ../src/dummy-strings.c:45
 msgid "Server not yet valid - try again later"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_NOTYET
-#: ../src/dummy-strings.c:41
+#: ../src/dummy-strings.c:46
 msgid "Password has expired"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_KEY_EXP
-#: ../src/dummy-strings.c:42
+#: ../src/dummy-strings.c:47
 msgid "Preauthentication failed"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_FAILED
-#: ../src/dummy-strings.c:43
+#: ../src/dummy-strings.c:48
 msgid "Additional pre-authentication required"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_REQUIRED
-#: ../src/dummy-strings.c:44
+#: ../src/dummy-strings.c:49
 msgid "Requested server and ticket don't match"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_SERVER_NOMATCH
-#: ../src/dummy-strings.c:45
+#: ../src/dummy-strings.c:50
 msgid "A service is not available that is required to process the request"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_SVC_UNAVAILABLE
-#: ../src/dummy-strings.c:46
+#: ../src/dummy-strings.c:51
 msgid "Decrypt integrity check failed"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BAD_INTEGRITY
-#: ../src/dummy-strings.c:47
+#: ../src/dummy-strings.c:52
 msgid "Ticket expired"
-msgstr ""
+msgstr "Billett utgått"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_EXPIRED
-#: ../src/dummy-strings.c:48
+#: ../src/dummy-strings.c:53
 msgid "Ticket not yet valid"
-msgstr ""
+msgstr "Billett er ikke gyldig ennå"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_NYV
-#: ../src/dummy-strings.c:49
+#: ../src/dummy-strings.c:54
 msgid "Request is a replay"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_REPEAT
-#: ../src/dummy-strings.c:50
+#: ../src/dummy-strings.c:55
 msgid "The ticket isn't for us"
-msgstr ""
+msgstr "Denne billetten er ikke for oss"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOT_US
-#: ../src/dummy-strings.c:51
+#: ../src/dummy-strings.c:56
 msgid "Ticket/authenticator don't match"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADMATCH
-#: ../src/dummy-strings.c:52
+#: ../src/dummy-strings.c:57
 msgid "Clock skew too great"
-msgstr ""
+msgstr "Klokkeforskyvning er for stor"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_SKEW
-#: ../src/dummy-strings.c:53
+#: ../src/dummy-strings.c:58
 msgid "Incorrect net address"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADADDR
-#: ../src/dummy-strings.c:54
+#: ../src/dummy-strings.c:59
 msgid "Protocol version mismatch"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADVERSION
-#: ../src/dummy-strings.c:55
+#: ../src/dummy-strings.c:60
 msgid "Invalid message type"
 msgstr "Ugyldig meldingstype"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_MSG_TYPE
-#: ../src/dummy-strings.c:56
+#: ../src/dummy-strings.c:61
 msgid "Message stream modified"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_MODIFIED
-#: ../src/dummy-strings.c:57
+#: ../src/dummy-strings.c:62
 msgid "Message out of order"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADORDER
-#: ../src/dummy-strings.c:58
+#: ../src/dummy-strings.c:63
 msgid "Illegal cross-realm ticket"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_ILL_CR_TKT
-#: ../src/dummy-strings.c:59
+#: ../src/dummy-strings.c:64
 msgid "Key version is not available"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADKEYVER
-#: ../src/dummy-strings.c:60
+#: ../src/dummy-strings.c:65
 msgid "Service key not available"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOKEY
 #. krb5_err.et:krb5:KRB5_NO_LOCALNAME
-#: ../src/dummy-strings.c:61 ../src/dummy-strings.c:117
+#: ../src/dummy-strings.c:66 ../src/dummy-strings.c:122
 msgid "Mutual authentication failed"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_MUT_FAIL
-#: ../src/dummy-strings.c:62
+#: ../src/dummy-strings.c:67
 msgid "Incorrect message direction"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADDIRECTION
-#: ../src/dummy-strings.c:63
+#: ../src/dummy-strings.c:68
 msgid "Alternative authentication method required"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_METHOD
-#: ../src/dummy-strings.c:64
+#: ../src/dummy-strings.c:69
 msgid "Incorrect sequence number in message"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADSEQ
-#: ../src/dummy-strings.c:65
+#: ../src/dummy-strings.c:70
 msgid "Inappropriate type of checksum in message"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_INAPP_CKSUM
-#: ../src/dummy-strings.c:66
+#: ../src/dummy-strings.c:71
 msgid "Policy rejects transited path"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_PATH_NOT_ACCEPTED
-#: ../src/dummy-strings.c:67
+#: ../src/dummy-strings.c:72
 msgid "Response too big for UDP, retry with TCP"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_ERR_RESPONSE_TOO_BIG
-#: ../src/dummy-strings.c:68
+#: ../src/dummy-strings.c:73
 msgid "Generic error (see e-text)"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_ERR_GENERIC
-#: ../src/dummy-strings.c:69
+#: ../src/dummy-strings.c:74
 msgid "Field is too long for this implementation"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_ERR_FIELD_TOOLONG
-#: ../src/dummy-strings.c:70
+#: ../src/dummy-strings.c:75
 msgid "Client not trusted"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NOT_TRUSTED
-#: ../src/dummy-strings.c:71
+#: ../src/dummy-strings.c:76
 msgid "KDC not trusted"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_KDC_NOT_TRUSTED
-#: ../src/dummy-strings.c:72
-#, fuzzy
+#: ../src/dummy-strings.c:77
 msgid "Invalid signature"
-msgstr "Ugyldig meldingstype"
+msgstr "Ugyldig signatur"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_INVALID_SIG
-#: ../src/dummy-strings.c:73
+#: ../src/dummy-strings.c:78
 msgid "Key parameters not accepted"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED
-#: ../src/dummy-strings.c:74
+#: ../src/dummy-strings.c:79
 msgid "Certificate mismatch"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CERTIFICATE_MISMATCH
-#: ../src/dummy-strings.c:75
+#: ../src/dummy-strings.c:80
 msgid "Can't verify certificate"
-msgstr ""
+msgstr "Kan ikke bekrefte sertifikated"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CANT_VERIFY_CERTIFICATE
-#: ../src/dummy-strings.c:76
-#, fuzzy
+#: ../src/dummy-strings.c:81
 msgid "Invalid certificate"
-msgstr "Ugyldig meldingstype"
+msgstr "Ugyldig sertifikat"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_INVALID_CERTIFICATE
-#: ../src/dummy-strings.c:77
+#: ../src/dummy-strings.c:82
 msgid "Revoked certificate"
-msgstr ""
+msgstr "Tilbaketrukket sertifikat"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_REVOKED_CERTIFICATE
-#: ../src/dummy-strings.c:78
+#: ../src/dummy-strings.c:83
 msgid "Revocation status unknown"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_REVOCATION_STATUS_UNKNOWN
-#: ../src/dummy-strings.c:79
+#: ../src/dummy-strings.c:84
 msgid "Revocation status unavailable"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_REVOCATION_STATUS_UNAVAILABLE
-#: ../src/dummy-strings.c:80
+#: ../src/dummy-strings.c:85
 msgid "Client name mismatch"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NAME_MISMATCH
-#: ../src/dummy-strings.c:81
+#: ../src/dummy-strings.c:86
 msgid "KDC name mismatch"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_KDC_NAME_MISMATCH
-#: ../src/dummy-strings.c:82
+#: ../src/dummy-strings.c:87
 msgid "Inconsistent key purpose"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_INCONSISTENT_KEY_PURPOSE
-#: ../src/dummy-strings.c:83
+#: ../src/dummy-strings.c:88
 msgid "Digest in certificate not accepted"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED
-#: ../src/dummy-strings.c:84
+#: ../src/dummy-strings.c:89
 msgid "Checksum must be included"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED
-#: ../src/dummy-strings.c:85
+#: ../src/dummy-strings.c:90
 msgid "Digest in signed-data not accepted"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED
-#: ../src/dummy-strings.c:86
+#: ../src/dummy-strings.c:91
 msgid "Public key encryption not supported"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED
-#: ../src/dummy-strings.c:87
+#: ../src/dummy-strings.c:92
 msgid "$Id: krb5_err.et 19934 2007-09-13 23:49:00Z tlyu $"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_ERR_RCSID
-#: ../src/dummy-strings.c:88
+#: ../src/dummy-strings.c:93
 msgid "Invalid flag for file lock mode"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_LIBOS_BADLOCKFLAG
-#: ../src/dummy-strings.c:89
+#: ../src/dummy-strings.c:94
 msgid "Cannot read password"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_LIBOS_CANTREADPWD
-#: ../src/dummy-strings.c:90
+#: ../src/dummy-strings.c:95
 msgid "Password mismatch"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_LIBOS_BADPWDMATCH
-#: ../src/dummy-strings.c:91
+#: ../src/dummy-strings.c:96
 msgid "Password read interrupted"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_LIBOS_PWDINTR
-#: ../src/dummy-strings.c:92
+#: ../src/dummy-strings.c:97
 msgid "Illegal character in component name"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PARSE_ILLCHAR
-#: ../src/dummy-strings.c:93
+#: ../src/dummy-strings.c:98
 msgid "Malformed representation of principal"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PARSE_MALFORMED
-#: ../src/dummy-strings.c:94
+#: ../src/dummy-strings.c:99
 msgid "Can't open/find Kerberos configuration file"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CONFIG_CANTOPEN
-#: ../src/dummy-strings.c:95
+#: ../src/dummy-strings.c:100
 msgid "Improper format of Kerberos configuration file"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CONFIG_BADFORMAT
-#: ../src/dummy-strings.c:96
+#: ../src/dummy-strings.c:101
 msgid "Insufficient space to return complete information"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CONFIG_NOTENUFSPACE
-#: ../src/dummy-strings.c:97
+#: ../src/dummy-strings.c:102
 msgid "Invalid message type specified for encoding"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_BADMSGTYPE
-#: ../src/dummy-strings.c:98
+#: ../src/dummy-strings.c:103
 msgid "Credential cache name malformed"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_BADNAME
-#: ../src/dummy-strings.c:99
+#: ../src/dummy-strings.c:104
 msgid "Unknown credential cache type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_UNKNOWN_TYPE
-#: ../src/dummy-strings.c:100
+#: ../src/dummy-strings.c:105
 msgid "Matching credential not found"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_NOTFOUND
-#: ../src/dummy-strings.c:101
+#: ../src/dummy-strings.c:106
 msgid "End of credential cache reached"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_END
-#: ../src/dummy-strings.c:102
+#: ../src/dummy-strings.c:107
 msgid "Request did not supply a ticket"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_NO_TKT_SUPPLIED
-#: ../src/dummy-strings.c:103
+#: ../src/dummy-strings.c:108
 msgid "Wrong principal in request"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_WRONG_PRINC
-#: ../src/dummy-strings.c:104
+#: ../src/dummy-strings.c:109
 msgid "Ticket has invalid flag set"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_INVALID
-#: ../src/dummy-strings.c:105
+#: ../src/dummy-strings.c:110
 msgid "Requested principal and ticket don't match"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PRINC_NOMATCH
-#: ../src/dummy-strings.c:106
+#: ../src/dummy-strings.c:111
 msgid "KDC reply did not match expectations"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KDCREP_MODIFIED
-#: ../src/dummy-strings.c:107
+#: ../src/dummy-strings.c:112
 msgid "Clock skew too great in KDC reply"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KDCREP_SKEW
-#: ../src/dummy-strings.c:108
+#: ../src/dummy-strings.c:113
 msgid "Client/server realm mismatch in initial ticket request"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_IN_TKT_REALM_MISMATCH
-#: ../src/dummy-strings.c:109
+#: ../src/dummy-strings.c:114
 msgid "Program lacks support for encryption type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PROG_ETYPE_NOSUPP
-#: ../src/dummy-strings.c:110
+#: ../src/dummy-strings.c:115
 msgid "Program lacks support for key type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PROG_KEYTYPE_NOSUPP
-#: ../src/dummy-strings.c:111
+#: ../src/dummy-strings.c:116
 msgid "Requested encryption type not used in message"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_WRONG_ETYPE
-#: ../src/dummy-strings.c:112
+#: ../src/dummy-strings.c:117
 msgid "Program lacks support for checksum type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PROG_SUMTYPE_NOSUPP
-#: ../src/dummy-strings.c:113
+#: ../src/dummy-strings.c:118
 msgid "Cannot find KDC for requested realm"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_REALM_UNKNOWN
-#: ../src/dummy-strings.c:114
+#: ../src/dummy-strings.c:119
 msgid "Kerberos service unknown"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_SERVICE_UNKNOWN
-#: ../src/dummy-strings.c:115
+#: ../src/dummy-strings.c:120
 msgid "Cannot contact any KDC for requested realm"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KDC_UNREACH
-#: ../src/dummy-strings.c:116
+#: ../src/dummy-strings.c:121
 msgid "No local name found for principal name"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_MUTUAL_FAILED
-#: ../src/dummy-strings.c:118
+#: ../src/dummy-strings.c:123
 msgid "Replay cache type is already registered"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_TYPE_EXISTS
-#: ../src/dummy-strings.c:119
+#: ../src/dummy-strings.c:124
 msgid "No more memory to allocate (in replay cache code)"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_MALLOC
-#: ../src/dummy-strings.c:120
+#: ../src/dummy-strings.c:125
 msgid "Replay cache type is unknown"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_TYPE_NOTFOUND
-#: ../src/dummy-strings.c:121
+#: ../src/dummy-strings.c:126
 msgid "Generic unknown RC error"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_UNKNOWN
-#: ../src/dummy-strings.c:122
+#: ../src/dummy-strings.c:127
 msgid "Message is a replay"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_REPLAY
-#: ../src/dummy-strings.c:123
+#: ../src/dummy-strings.c:128
 msgid "Replay I/O operation failed XXX"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_IO
-#: ../src/dummy-strings.c:124
+#: ../src/dummy-strings.c:129
 msgid "Replay cache type does not support non-volatile storage"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_NOIO
-#: ../src/dummy-strings.c:125
+#: ../src/dummy-strings.c:130
 msgid "Replay cache name parse/format error"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_PARSE
-#: ../src/dummy-strings.c:126
+#: ../src/dummy-strings.c:131
 msgid "End-of-file on replay cache I/O"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_IO_EOF
-#: ../src/dummy-strings.c:127
+#: ../src/dummy-strings.c:132
 msgid "No more memory to allocate (in replay cache I/O code)"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_IO_MALLOC
-#: ../src/dummy-strings.c:128
+#: ../src/dummy-strings.c:133
 msgid "Permission denied in replay cache code"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_IO_PERM
-#: ../src/dummy-strings.c:129
+#: ../src/dummy-strings.c:134
 msgid "I/O error in replay cache i/o code"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_IO_IO
-#: ../src/dummy-strings.c:130
+#: ../src/dummy-strings.c:135
 msgid "Generic unknown RC/IO error"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_IO_UNKNOWN
-#: ../src/dummy-strings.c:131
+#: ../src/dummy-strings.c:136
 msgid "Insufficient system space to store replay information"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_IO_SPACE
-#: ../src/dummy-strings.c:132
+#: ../src/dummy-strings.c:137
 msgid "Can't open/find realm translation file"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_TRANS_CANTOPEN
-#: ../src/dummy-strings.c:133
+#: ../src/dummy-strings.c:138
 msgid "Improper format of realm translation file"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_TRANS_BADFORMAT
-#: ../src/dummy-strings.c:134
+#: ../src/dummy-strings.c:139
 msgid "Can't open/find lname translation database"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_LNAME_CANTOPEN
-#: ../src/dummy-strings.c:135
+#: ../src/dummy-strings.c:140
 msgid "No translation available for requested principal"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_LNAME_NOTRANS
-#: ../src/dummy-strings.c:136
+#: ../src/dummy-strings.c:141
 msgid "Improper format of translation database entry"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_LNAME_BADFORMAT
-#: ../src/dummy-strings.c:137
+#: ../src/dummy-strings.c:142
 msgid "Cryptosystem internal error"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CRYPTO_INTERNAL
-#: ../src/dummy-strings.c:138
+#: ../src/dummy-strings.c:143
 msgid "Key table name malformed"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KT_BADNAME
-#: ../src/dummy-strings.c:139
+#: ../src/dummy-strings.c:144
 msgid "Unknown Key table type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KT_UNKNOWN_TYPE
-#: ../src/dummy-strings.c:140
+#: ../src/dummy-strings.c:145
 msgid "Key table entry not found"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KT_NOTFOUND
-#: ../src/dummy-strings.c:141
+#: ../src/dummy-strings.c:146
 msgid "End of key table reached"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KT_END
-#: ../src/dummy-strings.c:142
+#: ../src/dummy-strings.c:147
 msgid "Cannot write to specified key table"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KT_NOWRITE
-#: ../src/dummy-strings.c:143
+#: ../src/dummy-strings.c:148
 msgid "Error writing to key table"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KT_IOERR
-#: ../src/dummy-strings.c:144
+#: ../src/dummy-strings.c:149
 msgid "Cannot find ticket for requested realm"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_NO_TKT_IN_RLM
-#: ../src/dummy-strings.c:145
+#: ../src/dummy-strings.c:150
 msgid "DES key has bad parity"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5DES_BAD_KEYPAR
-#: ../src/dummy-strings.c:146
+#: ../src/dummy-strings.c:151
 msgid "DES key is a weak key"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5DES_WEAK_KEY
-#: ../src/dummy-strings.c:147
+#: ../src/dummy-strings.c:152
 msgid "Bad encryption type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_BAD_ENCTYPE
-#: ../src/dummy-strings.c:148
+#: ../src/dummy-strings.c:153
 msgid "Key size is incompatible with encryption type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_BAD_KEYSIZE
-#: ../src/dummy-strings.c:149
+#: ../src/dummy-strings.c:154
 msgid "Message size is incompatible with encryption type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_BAD_MSIZE
-#: ../src/dummy-strings.c:150
+#: ../src/dummy-strings.c:155
 msgid "Credentials cache type is already registered."
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_TYPE_EXISTS
-#: ../src/dummy-strings.c:151
+#: ../src/dummy-strings.c:156
 msgid "Key table type is already registered."
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KT_TYPE_EXISTS
-#: ../src/dummy-strings.c:152
+#: ../src/dummy-strings.c:157
 msgid "Credentials cache I/O operation failed XXX"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_IO
-#: ../src/dummy-strings.c:153
+#: ../src/dummy-strings.c:158
 msgid "Credentials cache permissions incorrect"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_FCC_PERM
-#: ../src/dummy-strings.c:154
+#: ../src/dummy-strings.c:159
 msgid "No credentials cache found"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_FCC_NOFILE
-#: ../src/dummy-strings.c:155
+#: ../src/dummy-strings.c:160
 msgid "Internal credentials cache error"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_FCC_INTERNAL
-#: ../src/dummy-strings.c:156
+#: ../src/dummy-strings.c:161
 msgid "Error writing to credentials cache"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_WRITE
-#: ../src/dummy-strings.c:157
+#: ../src/dummy-strings.c:162
 msgid "No more memory to allocate (in credentials cache code)"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_NOMEM
-#: ../src/dummy-strings.c:158
+#: ../src/dummy-strings.c:163
 msgid "Bad format in credentials cache"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_FORMAT
-#: ../src/dummy-strings.c:159
+#: ../src/dummy-strings.c:164
 msgid "No credentials found with supported encryption types"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_NOT_KTYPE
-#: ../src/dummy-strings.c:160
+#: ../src/dummy-strings.c:165
 msgid "Invalid KDC option combination (library internal error)"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_INVALID_FLAGS
-#: ../src/dummy-strings.c:161
+#: ../src/dummy-strings.c:166
 msgid "Request missing second ticket"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_NO_2ND_TKT
-#: ../src/dummy-strings.c:162
+#: ../src/dummy-strings.c:167
 msgid "No credentials supplied to library routine"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_NOCREDS_SUPPLIED
-#: ../src/dummy-strings.c:163
+#: ../src/dummy-strings.c:168
 msgid "Bad sendauth version was sent"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_SENDAUTH_BADAUTHVERS
-#: ../src/dummy-strings.c:164
+#: ../src/dummy-strings.c:169
 msgid "Bad application version was sent (via sendauth)"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_SENDAUTH_BADAPPLVERS
-#: ../src/dummy-strings.c:165
+#: ../src/dummy-strings.c:170
 msgid "Bad response (during sendauth exchange)"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_SENDAUTH_BADRESPONSE
-#: ../src/dummy-strings.c:166
+#: ../src/dummy-strings.c:171
 msgid "Server rejected authentication (during sendauth exchange)"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_SENDAUTH_REJECTED
-#: ../src/dummy-strings.c:167
+#: ../src/dummy-strings.c:172
 msgid "Unsupported preauthentication type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PREAUTH_BAD_TYPE
-#: ../src/dummy-strings.c:168
+#: ../src/dummy-strings.c:173
 msgid "Required preauthentication key not supplied"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PREAUTH_NO_KEY
-#: ../src/dummy-strings.c:169
+#: ../src/dummy-strings.c:174
 msgid "Generic preauthentication failure"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PREAUTH_FAILED
-#: ../src/dummy-strings.c:170
+#: ../src/dummy-strings.c:175
 msgid "Unsupported replay cache format version number"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RCACHE_BADVNO
-#: ../src/dummy-strings.c:171
+#: ../src/dummy-strings.c:176
 msgid "Unsupported credentials cache format version number"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CCACHE_BADVNO
-#: ../src/dummy-strings.c:172
+#: ../src/dummy-strings.c:177
 msgid "Unsupported key table format version number"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KEYTAB_BADVNO
-#: ../src/dummy-strings.c:173
+#: ../src/dummy-strings.c:178
 msgid "Program lacks support for address type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PROG_ATYPE_NOSUPP
-#: ../src/dummy-strings.c:174
+#: ../src/dummy-strings.c:179
 msgid "Message replay detection requires rcache parameter"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_RC_REQUIRED
-#: ../src/dummy-strings.c:175
+#: ../src/dummy-strings.c:180
 msgid "Hostname cannot be canonicalized"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_ERR_BAD_HOSTNAME
-#: ../src/dummy-strings.c:176
+#: ../src/dummy-strings.c:181
 msgid "Cannot determine realm for host"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_ERR_HOST_REALM_UNKNOWN
-#: ../src/dummy-strings.c:177
+#: ../src/dummy-strings.c:182
 msgid "Conversion to service principal undefined for name type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_SNAME_UNSUPP_NAMETYPE
-#: ../src/dummy-strings.c:178
+#: ../src/dummy-strings.c:183
 msgid "Initial Ticket response appears to be Version 4 error"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_V4_REPLY
-#: ../src/dummy-strings.c:179
+#: ../src/dummy-strings.c:184
 msgid "Cannot resolve network address for KDC in requested realm"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_REALM_CANT_RESOLVE
-#: ../src/dummy-strings.c:180
+#: ../src/dummy-strings.c:185
 msgid "Requesting ticket can't get forwardable tickets"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_TKT_NOT_FORWARDABLE
-#: ../src/dummy-strings.c:181
+#: ../src/dummy-strings.c:186
 msgid "Bad principal name while trying to forward credentials"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_FWD_BAD_PRINCIPAL
-#: ../src/dummy-strings.c:182
+#: ../src/dummy-strings.c:187
 msgid "Looping detected inside krb5_get_in_tkt"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_GET_IN_TKT_LOOP
-#: ../src/dummy-strings.c:183
+#: ../src/dummy-strings.c:188
 msgid "Configuration file does not specify default realm"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CONFIG_NODEFREALM
-#: ../src/dummy-strings.c:184
+#: ../src/dummy-strings.c:189
 msgid "Bad SAM flags in obtain_sam_padata"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_SAM_UNSUPPORTED
-#: ../src/dummy-strings.c:185
+#: ../src/dummy-strings.c:190
 msgid "Invalid encryption type in SAM challenge"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_SAM_INVALID_ETYPE
-#: ../src/dummy-strings.c:186
+#: ../src/dummy-strings.c:191
 msgid "Missing checksum in SAM challenge"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_SAM_NO_CHECKSUM
-#: ../src/dummy-strings.c:187
+#: ../src/dummy-strings.c:192
 msgid "Bad checksum in SAM challenge"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_SAM_BAD_CHECKSUM
-#: ../src/dummy-strings.c:188
+#: ../src/dummy-strings.c:193
 msgid "Keytab name too long"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KT_NAME_TOOLONG
-#: ../src/dummy-strings.c:189
+#: ../src/dummy-strings.c:194
 msgid "Key version number for principal in key table is incorrect"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KT_KVNONOTFOUND
-#: ../src/dummy-strings.c:190
+#: ../src/dummy-strings.c:195
 msgid "This application has expired"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_APPL_EXPIRED
-#: ../src/dummy-strings.c:191
+#: ../src/dummy-strings.c:196
 msgid "This Krb5 library has expired"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_LIB_EXPIRED
-#: ../src/dummy-strings.c:192
+#: ../src/dummy-strings.c:197
 msgid "New password cannot be zero length"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CHPW_PWDNULL
-#: ../src/dummy-strings.c:193
+#: ../src/dummy-strings.c:198
 msgid "Password change failed"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CHPW_FAIL
-#: ../src/dummy-strings.c:194
+#: ../src/dummy-strings.c:199
 msgid "Bad format in keytab"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_KT_FORMAT
-#: ../src/dummy-strings.c:195
+#: ../src/dummy-strings.c:200
 msgid "Encryption type not permitted"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_NOPERM_ETYPE
-#: ../src/dummy-strings.c:196
+#: ../src/dummy-strings.c:201
 msgid "No supported encryption types (config file error?)"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CONFIG_ETYPE_NOSUPP
-#: ../src/dummy-strings.c:197
+#: ../src/dummy-strings.c:202
 msgid "Program called an obsolete, deleted function"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_OBSOLETE_FN
-#: ../src/dummy-strings.c:198
+#: ../src/dummy-strings.c:203
 msgid "unknown getaddrinfo failure"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_EAI_FAIL
-#: ../src/dummy-strings.c:199
+#: ../src/dummy-strings.c:204
 msgid "no data available for host/domain name"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_EAI_NODATA
-#: ../src/dummy-strings.c:200
+#: ../src/dummy-strings.c:205
 msgid "host/domain name not found"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_EAI_NONAME
-#: ../src/dummy-strings.c:201
+#: ../src/dummy-strings.c:206
 msgid "service name unknown"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_EAI_SERVICE
-#: ../src/dummy-strings.c:202
+#: ../src/dummy-strings.c:207
 msgid "Cannot determine realm for numeric host address"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_ERR_NUMERIC_REALM
-#: ../src/dummy-strings.c:203
+#: ../src/dummy-strings.c:208
 msgid "Invalid key generation parameters from KDC"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_ERR_BAD_S2K_PARAMS
-#: ../src/dummy-strings.c:204
+#: ../src/dummy-strings.c:209
 msgid "service not available"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_ERR_NO_SERVICE
-#: ../src/dummy-strings.c:205
+#: ../src/dummy-strings.c:210
 msgid "Ccache function not supported: read-only ccache type"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_READONLY
-#: ../src/dummy-strings.c:206
+#: ../src/dummy-strings.c:211
 msgid "Ccache function not supported: not implemented"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_CC_NOSUPP
-#: ../src/dummy-strings.c:207
+#: ../src/dummy-strings.c:212
 msgid "Invalid format of Kerberos lifetime or clock skew string"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_DELTAT_BADFORMAT
-#: ../src/dummy-strings.c:208
+#: ../src/dummy-strings.c:213
 msgid "Supplied data not handled by this plugin"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PLUGIN_NO_HANDLE
-#: ../src/dummy-strings.c:209
+#: ../src/dummy-strings.c:214
 msgid "Plugin does not support the operaton"
 msgstr ""
 
 #. krb5_err.et:krb5:KRB5_PLUGIN_OP_NOTSUPP
-#: ../src/dummy-strings.c:210
+#: ../src/dummy-strings.c:215
 msgid "Kerberos V5 magic number table"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_NONE
-#: ../src/dummy-strings.c:211
+#: ../src/dummy-strings.c:216
 msgid "Bad magic number for krb5_principal structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_PRINCIPAL
-#: ../src/dummy-strings.c:212
+#: ../src/dummy-strings.c:217
 msgid "Bad magic number for krb5_data structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_DATA
-#: ../src/dummy-strings.c:213
+#: ../src/dummy-strings.c:218
 msgid "Bad magic number for krb5_keyblock structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_KEYBLOCK
-#: ../src/dummy-strings.c:214
+#: ../src/dummy-strings.c:219
 msgid "Bad magic number for krb5_checksum structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_CHECKSUM
-#: ../src/dummy-strings.c:215
+#: ../src/dummy-strings.c:220
 msgid "Bad magic number for krb5_encrypt_block structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_ENCRYPT_BLOCK
-#: ../src/dummy-strings.c:216
+#: ../src/dummy-strings.c:221
 msgid "Bad magic number for krb5_enc_data structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_ENC_DATA
-#: ../src/dummy-strings.c:217
+#: ../src/dummy-strings.c:222
 msgid "Bad magic number for krb5_cryptosystem_entry structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_CRYPTOSYSTEM_ENTRY
-#: ../src/dummy-strings.c:218
+#: ../src/dummy-strings.c:223
 msgid "Bad magic number for krb5_cs_table_entry structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_CS_TABLE_ENTRY
-#: ../src/dummy-strings.c:219
+#: ../src/dummy-strings.c:224
 msgid "Bad magic number for krb5_checksum_entry structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_CHECKSUM_ENTRY
-#: ../src/dummy-strings.c:220
+#: ../src/dummy-strings.c:225
 msgid "Bad magic number for krb5_authdata structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_AUTHDATA
-#: ../src/dummy-strings.c:221
+#: ../src/dummy-strings.c:226
 msgid "Bad magic number for krb5_transited structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_TRANSITED
-#: ../src/dummy-strings.c:222
+#: ../src/dummy-strings.c:227
 msgid "Bad magic number for krb5_enc_tkt_part structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_ENC_TKT_PART
-#: ../src/dummy-strings.c:223
+#: ../src/dummy-strings.c:228
 msgid "Bad magic number for krb5_ticket structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_TICKET
-#: ../src/dummy-strings.c:224
+#: ../src/dummy-strings.c:229
 msgid "Bad magic number for krb5_authenticator structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_AUTHENTICATOR
-#: ../src/dummy-strings.c:225
+#: ../src/dummy-strings.c:230
 msgid "Bad magic number for krb5_tkt_authent structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_TKT_AUTHENT
-#: ../src/dummy-strings.c:226
+#: ../src/dummy-strings.c:231
 msgid "Bad magic number for krb5_creds structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_CREDS
-#: ../src/dummy-strings.c:227
+#: ../src/dummy-strings.c:232
 msgid "Bad magic number for krb5_last_req_entry structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_LAST_REQ_ENTRY
-#: ../src/dummy-strings.c:228
+#: ../src/dummy-strings.c:233
 msgid "Bad magic number for krb5_pa_data structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_PA_DATA
-#: ../src/dummy-strings.c:229
+#: ../src/dummy-strings.c:234
 msgid "Bad magic number for krb5_kdc_req structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_KDC_REQ
-#: ../src/dummy-strings.c:230
+#: ../src/dummy-strings.c:235
 msgid "Bad magic number for krb5_enc_kdc_rep_part structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_ENC_KDC_REP_PART
-#: ../src/dummy-strings.c:231
+#: ../src/dummy-strings.c:236
 msgid "Bad magic number for krb5_kdc_rep structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_KDC_REP
-#: ../src/dummy-strings.c:232
+#: ../src/dummy-strings.c:237
 msgid "Bad magic number for krb5_error structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_ERROR
-#: ../src/dummy-strings.c:233
+#: ../src/dummy-strings.c:238
 msgid "Bad magic number for krb5_ap_req structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_AP_REQ
-#: ../src/dummy-strings.c:234
+#: ../src/dummy-strings.c:239
 msgid "Bad magic number for krb5_ap_rep structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_AP_REP
-#: ../src/dummy-strings.c:235
+#: ../src/dummy-strings.c:240
 msgid "Bad magic number for krb5_ap_rep_enc_part structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_AP_REP_ENC_PART
-#: ../src/dummy-strings.c:236
+#: ../src/dummy-strings.c:241
 msgid "Bad magic number for krb5_response structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_RESPONSE
-#: ../src/dummy-strings.c:237
+#: ../src/dummy-strings.c:242
 msgid "Bad magic number for krb5_safe structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_SAFE
-#: ../src/dummy-strings.c:238
+#: ../src/dummy-strings.c:243
 msgid "Bad magic number for krb5_priv structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_PRIV
-#: ../src/dummy-strings.c:239
+#: ../src/dummy-strings.c:244
 msgid "Bad magic number for krb5_priv_enc_part structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_PRIV_ENC_PART
-#: ../src/dummy-strings.c:240
+#: ../src/dummy-strings.c:245
 msgid "Bad magic number for krb5_cred structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_CRED
-#: ../src/dummy-strings.c:241
+#: ../src/dummy-strings.c:246
 msgid "Bad magic number for krb5_cred_info structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_CRED_INFO
-#: ../src/dummy-strings.c:242
+#: ../src/dummy-strings.c:247
 msgid "Bad magic number for krb5_cred_enc_part structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_CRED_ENC_PART
-#: ../src/dummy-strings.c:243
+#: ../src/dummy-strings.c:248
 msgid "Bad magic number for krb5_pwd_data structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_PWD_DATA
-#: ../src/dummy-strings.c:244
+#: ../src/dummy-strings.c:249
 msgid "Bad magic number for krb5_address structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_ADDRESS
-#: ../src/dummy-strings.c:245
+#: ../src/dummy-strings.c:250
 msgid "Bad magic number for krb5_keytab_entry structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_KEYTAB_ENTRY
-#: ../src/dummy-strings.c:246
+#: ../src/dummy-strings.c:251
 msgid "Bad magic number for krb5_context structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_CONTEXT
-#: ../src/dummy-strings.c:247
+#: ../src/dummy-strings.c:252
 msgid "Bad magic number for krb5_os_context structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_OS_CONTEXT
-#: ../src/dummy-strings.c:248
+#: ../src/dummy-strings.c:253
 msgid "Bad magic number for krb5_alt_method structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_ALT_METHOD
-#: ../src/dummy-strings.c:249
+#: ../src/dummy-strings.c:254
 msgid "Bad magic number for krb5_etype_info_entry structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_ETYPE_INFO_ENTRY
-#: ../src/dummy-strings.c:250
+#: ../src/dummy-strings.c:255
 msgid "Bad magic number for krb5_db_context structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_DB_CONTEXT
-#: ../src/dummy-strings.c:251
+#: ../src/dummy-strings.c:256
 msgid "Bad magic number for krb5_auth_context structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_AUTH_CONTEXT
-#: ../src/dummy-strings.c:252
+#: ../src/dummy-strings.c:257
 msgid "Bad magic number for krb5_keytab structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_KEYTAB
-#: ../src/dummy-strings.c:253
+#: ../src/dummy-strings.c:258
 msgid "Bad magic number for krb5_rcache structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_RCACHE
-#: ../src/dummy-strings.c:254
+#: ../src/dummy-strings.c:259
 msgid "Bad magic number for krb5_ccache structure"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_CCACHE
-#: ../src/dummy-strings.c:255
+#: ../src/dummy-strings.c:260
 msgid "Bad magic number for krb5_preauth_ops"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_PREAUTH_OPS
-#: ../src/dummy-strings.c:256
+#: ../src/dummy-strings.c:261
 msgid "Bad magic number for krb5_sam_challenge"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_SAM_CHALLENGE
-#: ../src/dummy-strings.c:257
+#: ../src/dummy-strings.c:262
 msgid "Bad magic number for krb5_sam_challenge_2"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_SAM_CHALLENGE_2
-#: ../src/dummy-strings.c:258
+#: ../src/dummy-strings.c:263
 msgid "Bad magic number for krb5_sam_key"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_SAM_KEY
 #. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC
-#: ../src/dummy-strings.c:259 ../src/dummy-strings.c:260
+#: ../src/dummy-strings.c:264 ../src/dummy-strings.c:265
 msgid "Bad magic number for krb5_enc_sam_response_enc"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC_2
-#: ../src/dummy-strings.c:261
+#: ../src/dummy-strings.c:266
 msgid "Bad magic number for krb5_sam_response"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_SAM_RESPONSE
-#: ../src/dummy-strings.c:262
+#: ../src/dummy-strings.c:267
 msgid "Bad magic number for krb5_sam_response 2"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_SAM_RESPONSE_2
-#: ../src/dummy-strings.c:263
+#: ../src/dummy-strings.c:268
 msgid "Bad magic number for krb5_predicted_sam_response"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_PREDICTED_SAM_RESPONSE
-#: ../src/dummy-strings.c:264
+#: ../src/dummy-strings.c:269
 msgid "Bad magic number for passwd_phrase_element"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_PASSWD_PHRASE_ELEMENT
-#: ../src/dummy-strings.c:265
+#: ../src/dummy-strings.c:270
 msgid "Bad magic number for GSSAPI OID"
 msgstr ""
 
 #. kv5m_err.et:kv5m:KV5M_GSS_OID
-#: ../src/dummy-strings.c:266
+#: ../src/dummy-strings.c:271
 msgid "Bad magic number for GSSAPI QUEUE"
 msgstr ""
 
-#: ../src/krb5-auth-applet.c:353
+#. Translators: First number is hours, second number is minutes
+#: ../src/ka-applet.c:386
 #, fuzzy, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
-msgstr "Påloggingsinformasjonen utløper om %d minutt"
+msgstr "Påloggingsinformasjonen utløper om %d minutt"
 
-#: ../src/krb5-auth-applet.c:449
+#: ../src/ka-applet.c:491
 msgid "Don't show me this again"
-msgstr ""
+msgstr "Ikke vis meg dette igjen"
 
-#: ../src/krb5-auth-applet.c:486
+#: ../src/ka-applet.c:533
 #, fuzzy
 msgid "Network credentials valid"
-msgstr "Påloggingsinformasjonen har gått ut"
+msgstr "Påloggingsinformasjonen har gått ut"
 
-#: ../src/krb5-auth-applet.c:487
+#: ../src/ka-applet.c:534
 #, fuzzy
 msgid "You've refreshed your Kerberos credentials."
-msgstr "Påloggingsinformasjonen har gått ut"
+msgstr "Påloggingsinformasjonen har gått ut"
 
-#: ../src/krb5-auth-applet.c:500
+#: ../src/ka-applet.c:550
 #, fuzzy
 msgid "Network credentials expiring"
-msgstr "Påloggingsinformasjonen har gått ut"
+msgstr "Påloggingsinformasjonen har gått ut"
 
-#: ../src/krb5-auth-applet.c:515
+#: ../src/ka-applet.c:569
 #, fuzzy
 msgid "Network credentials expired"
-msgstr "Påloggingsinformasjonen har gått ut"
+msgstr "Påloggingsinformasjonen har gått ut"
 
-#: ../src/krb5-auth-applet.c:516
+#: ../src/ka-applet.c:570
 #, fuzzy
 msgid "Your Kerberos credentails have expired."
-msgstr "Påloggingsinformasjonen har gått ut"
+msgstr "Påloggingsinformasjonen har gått ut"
+
+#: ../src/ka-applet.c:615
+#, c-format
+msgid "There was an error launching the preferences dialog: %s"
+msgstr ""
 
-#: ../src/krb5-auth-applet.c:580
+#: ../src/ka-applet.c:656
 #, c-format
 msgid ""
 "There was an error displaying %s:\n"
 "%s"
 msgstr ""
 
-#: ../src/krb5-auth-applet.c:615
+#. Translators: add the translators of your language here
+#: ../src/ka-applet.c:692
 msgid "translator-credits"
 msgstr ""
 
 #. kdestroy
-#: ../src/krb5-auth-applet.c:650
+#: ../src/ka-applet.c:734
 msgid "Remove Credentials _Cache"
 msgstr ""
 
-#. Preferences
-#: ../src/krb5-auth-applet.c:660
-msgid "_Preferences"
+#: ../src/ka-tools.c:45
+#, c-format
+msgid ""
+"There was an error displaying help:\n"
+"%s"
 msgstr ""
 
-#. About item
-#: ../src/krb5-auth-applet.c:668
-msgid "_Help"
+#: ../src/ka-tickets.c:54
+msgid "Principal"
 msgstr ""
 
-#. About item
-#: ../src/krb5-auth-applet.c:676
-msgid "_About"
-msgstr ""
+#: ../src/ka-tickets.c:60
+msgid "Start Time"
+msgstr "Starttid"
+
+#: ../src/ka-tickets.c:66
+msgid "End Time"
+msgstr "Sluttid"
+
+#: ../src/ka-tickets.c:72
+msgid "Fwd"
+msgstr "Videresendt"
 
-#. Quit
-#: ../src/krb5-auth-applet.c:686
-msgid "_Quit"
+#: ../src/ka-tickets.c:78
+msgid "Proxy"
 msgstr ""
 
-#: ../src/krb5-auth-tools.c:45
-#, c-format
-msgid ""
-"There was an error displaying help:\n"
-"%s"
+#: ../src/ka-tickets.c:84
+msgid "Renew"
+msgstr "Forny"
+
+#: ../src/ka-tickets.c:107
+msgid "Error displaying service ticket information"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.desktop.in.h:1
@@ -1442,169 +1477,99 @@ msgid "Kerberos Network Authentication Dialog"
 msgstr "Dialog for nettverksautentisering via Kerberos"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:1
-msgid "Forwardable ticket"
-msgstr ""
+msgid "Enabled plugins"
+msgstr "Aktiverte utvidelser"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:2
-msgid "Kerberos principal"
+msgid "Forwardable ticket"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:3
-msgid "Notify user when ticket becomes valid"
+msgid "Kerberos principal"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:4
-msgid "Notify user when ticket has expired"
-msgstr ""
+msgid "List of plugins that should be loaded and activated on startup."
+msgstr "Liste over utvidelser som skal lastes og aktiveres ved start"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:5
-msgid "Notify user when ticket is about to expire"
+msgid "Notify user when ticket becomes valid"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:6
-msgid "PKINIT CA certificates"
+msgid "Notify user when ticket has expired"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:7
-msgid "PKINIT identifier"
+msgid "Notify user when ticket is about to expire"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:8
-msgid "PKINIT trust anchors"
+msgid "PKINIT CA certificates"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:9
-msgid "Prompt minutes before expiry"
+msgid "PKINIT identifier"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:10
-msgid "Proxiable ticket"
+msgid "PKINIT trust anchors"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:11
-#, fuzzy
-msgid "Renewable ticket"
-msgstr "Fo_rny billett"
+msgid "Prompt minutes before expiry"
+msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:12
-msgid "Requested tickets should be forwardable"
+msgid "Proxiable ticket"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:13
-msgid "Requested tickets should be proxiable"
-msgstr ""
+msgid "Renewable ticket"
+msgstr "Fornybar billett"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:14
-msgid "Requested tickets should be renewable"
+msgid "Requested tickets should be forwardable"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:15
-msgid "Show a trayicon in the status area of the panel"
+msgid "Requested tickets should be proxiable"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:16
-msgid "Show trayicon"
+msgid "Requested tickets should be renewable"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:17
-msgid ""
-"Start prompting/displaying notifications that many minutes before expiry"
+msgid "Show a trayicon in the status area of the panel"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:18
-msgid "The kerberos principal to acquire the ticket for"
+msgid "Show trayicon"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:19
-msgid "The principal's public/private/certificate identifier when using PKINIT"
+msgid "Start prompting/displaying notifications that many minutes before expiry"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:20
-msgid "ticket expired notification"
+msgid "The kerberos principal to acquire the ticket for"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:21
-msgid "ticket expiring notification"
+msgid "The principal's public/private/certificate identifier when using PKINIT"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:22
-#, fuzzy
-msgid "valid ticket notification"
-msgstr "Ugyldig meldingstype"
-
-#: ../gtksecentry/gtksecentry.c:454
-msgid "Cursor Position"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:456
-msgid "The current position of the insertion cursor in chars"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:463
-msgid "Selection Bound"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:465
-msgid ""
-"The position of the opposite end of the selection from the cursor in chars"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:472
-msgid "Maximum length"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:474
-msgid "Maximum number of characters for this entry. Zero if no maximum"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:482
-msgid "Has Frame"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:484
-msgid "FALSE removes outside bevel from entry"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:493
-msgid "Invisible character"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:495
-msgid "The character to use when masking entry contents (in \"password mode\")"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:504
-msgid "Activates default"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:506
-msgid ""
-"Whether to activate the default widget (such as the default button in a "
-"dialog) when Enter is pressed"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:511
-msgid "Width in chars"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:513
-msgid "Number of characters to leave space for in the entry"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:521
-msgid "Scroll offset"
-msgstr ""
-
-#: ../gtksecentry/gtksecentry.c:523
-msgid "Number of pixels of the entry scrolled off the screen to the left"
+msgid "ticket expired notification"
 msgstr ""
 
-#: ../gtksecentry/gtksecentry.c:530
-msgid "Text"
+#: ../src/krb5-auth-dialog.schemas.in.h:23
+msgid "ticket expiring notification"
 msgstr ""
 
-#: ../gtksecentry/gtksecentry.c:532
-msgid "The contents of the entry"
+#: ../src/krb5-auth-dialog.schemas.in.h:24
+msgid "valid ticket notification"
 msgstr ""
 
 #: ../secmem/util.c:106
@@ -1612,194 +1577,134 @@ msgstr ""
 msgid "Warning: running q-agent setuid on this system is dangerous\n"
 msgstr ""
 
+#: ../preferences/ka-preferences.c:345
+msgid "Choose Certificate"
+msgstr "Velg sertifikat"
+
+#: ../preferences/ka-preferences.c:361
+msgid "X509 Certificates"
+msgstr "X509-sertifikater"
+
+#: ../preferences/ka-preferences.c:365
+msgid "all files"
+msgstr "alle filer"
+
 #: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:2
-#, fuzzy
-msgid "Set your Kerberos network authenticaion preferences"
-msgstr "Dialog for nettverksautentisering via Kerberos"
+msgid "Set your Kerberos network authentication preferences"
+msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:1
-msgid "    "
+msgid "Appearance"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:2
-msgid "<b>Appearance</b>"
+msgid "Applet"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:3
-msgid "<b>Kerberos User</b>"
+msgid "Certificate and private key used for authentication"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:4
-msgid "<b>Notifications</b>"
+msgid "If checked, display the tray icon in the status bar"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:5
-msgid "<b>Ticket Options</b>"
+msgid "If checked, request forwardable tickets"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:6
-msgid "Applet"
+msgid "If checked, request proxiable tickets"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:7
-msgid "If checked, display the tray icon in the status bar."
+msgid "If checked, request renewable tickets"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:8
-msgid "If checked, request forwardable tickets"
+msgid "If checked, use a security token (Smartcard) to authenticate."
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:9
-msgid "If checked, request proxiable tickets"
-msgstr ""
+msgid "Kerberos"
+msgstr "Kerberos"
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:10
-msgid "If checked, request renewable tickets"
+msgid "Kerberos Authentication Configuration"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:11
-msgid "Kerberos"
-msgstr ""
+msgid "Kerberos User"
+msgstr "Kerberosbruker"
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:12
-#, fuzzy
-msgid "Kerberos Authentication Configuration"
-msgstr "Dialog for nettverksautentisering via Kerberos"
+msgid "Kerberos principal:"
+msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:13
-msgid "Kerberos principal:"
+msgid "Notifications"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:14
-msgid "PKINIT userid:\t"
-msgstr ""
+msgid "PKINIT:"
+msgstr "PKINIT:"
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:15
-msgid "PKINT anchors:"
+msgid "Requested Kerberos tickets should be:"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:16
-msgid "Path to CA certificates used as trust anchors for PKINIT"
+msgid ""
+"Send notification about ticket expiry that many minutes before it finally "
+"expires"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:17
-msgid "Requested Kerberos tickets should be:"
+msgid "Show tray icon"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:18
-msgid ""
-"Send notification about ticket expiry that many minutes before it finally "
-"expires. "
-msgstr ""
+msgid "Ticket Options"
+msgstr "Billettvalg"
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:19
-msgid "Show tray icon"
-msgstr ""
+msgid "Use Smartcard"
+msgstr "Bruk smartkort"
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:20
-msgid ""
-"The principal's public/private/certificate identifier. Leave empty if not "
-"using PKINIT."
-msgstr ""
-
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:21
-msgid "Warn"
-msgstr ""
+msgid "Userid:"
+msgstr "Brukerid:"
 
+#. Used in combination: 'Warn x minutes before expiry'
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:22
-msgid "forwardable"
+msgid "Warn"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:23
-msgid "gtk-close"
+msgid "X509 trust anchors:"
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:24
-msgid "gtk-help"
+msgid "_Browse..."
 msgstr ""
 
 #: ../preferences/krb5-auth-dialog-preferences.xml.h:25
+msgid "forwardable"
+msgstr ""
+
+#. Used in combination: 'Warn x minutes before expiry'
+#: ../preferences/krb5-auth-dialog-preferences.xml.h:27
 msgid "minutes before expiry"
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:26
+#: ../preferences/krb5-auth-dialog-preferences.xml.h:28
 msgid "proxiable"
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:27
-#, fuzzy
+#: ../preferences/krb5-auth-dialog-preferences.xml.h:29
 msgid "renewable"
-msgstr "Fo_rny billett"
-
-#, fuzzy
-#~ msgid "Your Kerberos credentials have been refreshed."
-#~ msgstr "Påloggingsinformasjonen har gått ut"
-
-#~ msgid "_Password:"
-#~ msgstr "_Passord:"
-
-#~ msgid "Repeated request"
-#~ msgstr "Gjentatt forespørsel"
-
-#~ msgid "Request is inconsistent"
-#~ msgstr "Forespørselen er inkonsistent"
-
-#~ msgid "Delta-T too big"
-#~ msgstr "Delta-T for stor"
-
-#~ msgid "Unauthorized request"
-#~ msgstr "Uautorisert forespørsel"
-
-#~ msgid "Protocol error"
-#~ msgstr "Protokollfeil"
-
-#~ msgid "Can't send request"
-#~ msgstr "Kan ikke sende forespørsel"
-
-#~ msgid "Command not found"
-#~ msgstr "Kommando ikke funnet"
-
-#~ msgid "No info available"
-#~ msgstr "Ingen informasjon tilgjengelig"
-
-#~ msgid "Usage: kpasswd [principal_name]."
-#~ msgstr "Bruk: kpasswd [hovednavn]."
-
-#~ msgid "Old Kerberos password is incorrect. Please try again."
-#~ msgstr "Gammelt Kerberos-passord er ugyldig. Vennligst prøv igjen."
-
-#~ msgid "New passwords do not match - password not changed.\n"
-#~ msgstr "Nye passord er ikke like - passord ikke endret.\n"
-
-#~ msgid "Kerberos password changed.\n"
-#~ msgstr "Kerberos-passord endret.\n"
-
-#~ msgid "Password not changed."
-#~ msgstr "Passord ikke endret."
-
-#~ msgid "Unable to identify user from password file."
-#~ msgstr "Kan ikke identifisere bruker fra passordfil."
-
-#~ msgid "Changing password for %s."
-#~ msgstr "Endrer passord for %s."
-
-#~ msgid "Old password"
-#~ msgstr "Gammelt passord"
-
-#~ msgid "Proceed <y|n>?"
-#~ msgstr "Fortsett <j/n>?"
-
-#~ msgid "cannot open /dev/tty!!"
-#~ msgstr "kan ikke åpne /dev/tty!!"
-
-#~ msgid "New password"
-#~ msgstr "Nytt passord"
-
-#~ msgid "New password (again)"
-#~ msgstr "Nytt passord (igjen)"
+msgstr "fornybar"
 
-#~ msgid "Password changed.\n"
-#~ msgstr "Passord endret.\n"
+msgid "PKINIT anchors:"
+msgstr "PKINIT Anker:"
 
-#~ msgid "Validation error"
-#~ msgstr "Feil under validering"
diff --git a/preferences/Makefile.in b/preferences/Makefile.in
index a95522f..852125f 100644
--- a/preferences/Makefile.in
+++ b/preferences/Makefile.in
@@ -232,6 +232,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/preferences/ka-preferences.c b/preferences/ka-preferences.c
index f925b7e..e408dac 100644
--- a/preferences/ka-preferences.c
+++ b/preferences/ka-preferences.c
@@ -826,7 +826,7 @@ main (int argc, char *argv[])
       g_print ("%s\n%s\n",
                error->message,
                help_msg);
-     g_error_free (error);
+     g_clear_error (&error);
      return 1;
   }
   textdomain (PACKAGE);
diff --git a/secmem/Makefile.in b/secmem/Makefile.in
index 8c13706..215dd4b 100644
--- a/secmem/Makefile.in
+++ b/secmem/Makefile.in
@@ -214,6 +214,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/src/Makefile.in b/src/Makefile.in
index b812d80..ace15f5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -246,6 +246,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PAM_LIBS = @PAM_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
diff --git a/src/dummy-strings.c b/src/dummy-strings.c
index 7f8bbee..272ee53 100644
--- a/src/dummy-strings.c
+++ b/src/dummy-strings.c
@@ -5,7 +5,7 @@
 const char *dummy[] = {
 	/* Translators: files from dummy-strings.c are *all* possible errors
            returned from Kerberos (since Kerberos itself doesn't handle i18n). If in
-	   doubt please translate strings from files starting with krb5-auth
+	   doubt please translate strings from files starting with ka- and krb5-auth-
 	   first since these are the ones the user will see in any case. */
 	N_("ASN.1 failed call to system time library"),	/* asn1_err.et:asn1:ASN1_BAD_TIMEFORMAT */
 	N_("ASN.1 structure is missing a required field"),	/* asn1_err.et:asn1:ASN1_MISSING_FIELD */
diff --git a/src/ka-applet.c b/src/ka-applet.c
index 472f4f5..bce4288 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -463,7 +463,8 @@ ka_send_event_notification (KaApplet *applet,
 			    const char *icon,
 			    const char *action)
 {
-        const char *notify_icon;
+	const char *notify_icon;
+	GError *error = NULL;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (summary != NULL);
@@ -473,8 +474,16 @@ ka_send_event_notification (KaApplet *applet,
 		notify_init (PACKAGE);
 
 	if (applet->priv->notification != NULL) {
-		notify_notification_close (applet->priv->notification, NULL);
+		if (!notify_notification_close (applet->priv->notification,
+		                                &error)) {
+			if (error)
+				g_warning ("Cannot close notification %s",
+					   error->message);
+			else
+				g_warning ("Cannot close notification");
+		}
 		g_object_unref (applet->priv->notification);
+		g_clear_error (&error);
 	}
 
 	notify_icon = icon ? icon : "krb-valid-ticket";
@@ -620,7 +629,7 @@ ka_applet_cb_preferences (GtkWidget* menuitem G_GNUC_UNUSED,
 				  G_CALLBACK (gtk_widget_destroy),
 				  NULL);
 		gtk_widget_show (message_dialog);
-		g_error_free (error);
+		g_clear_error (&error);
 	  }
 }
 
@@ -661,7 +670,7 @@ ka_about_dialog_url_hook (GtkAboutDialog *about,
 				  G_CALLBACK (gtk_widget_destroy),
 				  NULL);
 		gtk_widget_show (message_dialog);
-		g_error_free (error);
+		g_clear_error (&error);
 	  }
 }
 
diff --git a/src/ka-dialog.c b/src/ka-dialog.c
index f8d0fea..f11293d 100644
--- a/src/ka-dialog.c
+++ b/src/ka-dialog.c
@@ -206,6 +206,7 @@ credentials_expiring_real (KaApplet* applet)
 	krb5_timestamp now;
 	gboolean retval = FALSE;
 
+	memset(&my_creds, 0, sizeof(my_creds));
 	ka_applet_set_tgt_renewable(applet, FALSE);
 	if (!ka_get_tgt_from_ccache (kcontext, &my_creds)) {
 		creds_expiry = 0;
@@ -223,13 +224,17 @@ credentials_expiring_real (KaApplet* applet)
 	    (now + ka_applet_get_pw_prompt_secs(applet) > my_creds.times.endtime))
 		retval = TRUE;
 
-	/* If our creds are expiring, determine whether they are renewable */
-	if (retval && get_cred_renewable(&my_creds) && my_creds.times.renew_till > now) {
+	/* If our creds are expiring, determine whether they are renewable.
+	 * If the expiry is already at the renew_till time, don't consider
+	 * credentials renewable */
+	if (retval && get_cred_renewable(&my_creds)
+	    && my_creds.times.renew_till > now
+	    && my_creds.times.renew_till > creds_expiry) {
 		ka_applet_set_tgt_renewable(applet, TRUE);
 	}
 
-	krb5_free_cred_contents (kcontext, &my_creds);
 out:
+	krb5_free_cred_contents (kcontext, &my_creds);
 	ka_applet_update_status(applet, creds_expiry);
 	return retval;
 }
@@ -557,46 +562,6 @@ ka_set_ticket_options(KaApplet* applet, krb5_context context,
 }
 
 
-/*
- * set ticket options
- * by looking at krb5.conf, the passed in creds and gconf
- */
-static void
-set_options_from_creds(const KaApplet* applet,
-		       krb5_context context,
-		       krb5_creds *in,
-		       krb5_get_init_creds_opt *out)
-{
-	krb5_deltat renew_lifetime;
-	int flag;
-
-#ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_DEFAULT_FLAGS
-	krb5_get_init_creds_opt_set_default_flags(context, PACKAGE,
-		krb5_principal_get_realm(context, kprincipal), out);
-#endif
-
-	flag = get_cred_forwardable(in) != 0;
-	krb5_get_init_creds_opt_set_forwardable(out, flag);
-	flag = get_cred_proxiable(in) != 0;
-	krb5_get_init_creds_opt_set_proxiable(out, flag);
-	flag = get_cred_renewable(in) != 0;
-	if (flag && (in->times.renew_till > in->times.starttime)) {
-		renew_lifetime = in->times.renew_till -
-				 in->times.starttime;
-		krb5_get_init_creds_opt_set_renew_life(out,
-						       renew_lifetime);
-	}
-	if (in->times.endtime >
-	    in->times.starttime + ka_applet_get_pw_prompt_secs(applet)) {
-		krb5_get_init_creds_opt_set_tkt_life(out,
-						     in->times.endtime -
-						     in->times.starttime);
-	}
-	/* This doesn't do a deep copy -- fix it later. */
-	/* krb5_get_init_creds_opt_set_address_list(out, creds->addresses); */
-}
-
-
 #if ENABLE_PKINIT && HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PKINIT
 static krb5_error_code
 ka_auth_heimdal_pkinit(KaApplet* applet, krb5_creds* creds,
@@ -728,14 +693,13 @@ ccache_changed_cb (GFileMonitor *monitor G_GNUC_UNUSED,
 }
 
 
-static gboolean
+static GFileMonitor*
 monitor_ccache(KaApplet *applet)
 {
 	const gchar *ccache_name;
 	GFile *ccache;
-	GFileMonitor *monitor;
+	GFileMonitor *monitor = NULL;
 	GError *err = NULL;
-	gboolean ret = FALSE;
 
 	ccache_name = ka_ccache_filename ();
 	g_return_val_if_fail (ccache_name != NULL, FALSE);
@@ -749,18 +713,14 @@ monitor_ccache(KaApplet *applet)
 			credentials_expiring ((gpointer)applet);
 		else
 			g_warning ("Failed to monitor %s: %s", ccache_name, err->message);
-		goto out;
 	} else {
 		/* g_file_monitor_set_rate_limit(monitor, 10*1000); */
 		g_signal_connect (monitor, "changed", G_CALLBACK (ccache_changed_cb), applet);
 		KA_DEBUG ("Monitoring %s", ccache_name);
-		ret = TRUE;
 	}
-out:
 	g_object_unref (ccache);
-	if (err)
-		g_error_free (err);
-	return ret;
+	g_clear_error (&err);
+	return monitor;
 }
 
 
@@ -846,8 +806,8 @@ ka_renew_credentials (KaApplet* applet)
 	krb5_error_code retval;
 	krb5_creds my_creds;
 	krb5_ccache ccache;
-	krb5_get_init_creds_opt opts;
 
+	memset(&my_creds, 0, sizeof(my_creds));
 	if (kprincipal == NULL) {
 		retval = ka_parse_name(applet, kcontext, &kprincipal);
 		if (retval)
@@ -860,15 +820,13 @@ ka_renew_credentials (KaApplet* applet)
 
 	retval = ka_get_tgt_from_ccache (kcontext, &my_creds);
 	if (!retval) {
+		krb5_free_cred_contents (kcontext, &my_creds);
 		krb5_cc_close (kcontext, ccache);
 		return -1;
 	}
 
-	krb5_get_init_creds_opt_init (&opts);
-	set_options_from_creds (applet, kcontext, &my_creds, &opts);
-
 	if (ka_applet_get_tgt_renewable(applet)) {
-
+		krb5_free_cred_contents (kcontext, &my_creds);
 		retval = get_renewed_creds (kcontext, &my_creds, kprincipal, ccache, NULL);
 		if (retval)
 			goto out;
@@ -921,12 +879,11 @@ ka_get_tgt_from_ccache (krb5_context context, krb5_creds *creds)
 				     get_principal_realm_data(principal), 0)) {
 		goto out_free_princ;
 	}
-
 	pattern.client = principal;
 	if (!krb5_cc_retrieve_cred(context, ccache, 0, &pattern, creds))
 		ret = TRUE;
-	krb5_free_principal(context, pattern.server);
 
+	krb5_free_principal(context, pattern.server);
 out_free_princ:
 	krb5_free_principal(context, principal);
 out:
@@ -1124,6 +1081,7 @@ main (int argc, char *argv[])
 			"Always run", NULL},
 		{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
 	};
+	GFileMonitor *monitor = NULL;
 
 	context = g_option_context_new ("- Kerberos 5 credential checking");
 	g_option_context_add_main_entries (context, options, NULL);
@@ -1134,7 +1092,7 @@ main (int argc, char *argv[])
 		g_print ("%s\n%s\n",
 			 error->message,
 			 help_msg);
-		g_error_free (error);
+		g_clear_error (&error);
 		return 1;
 	}
 	g_option_context_free (context);
@@ -1161,11 +1119,13 @@ main (int argc, char *argv[])
 
 		if (credentials_expiring ((gpointer)applet)) {
 			g_timeout_add_seconds (CREDENTIAL_CHECK_INTERVAL, (GSourceFunc)credentials_expiring, applet);
-			monitor_ccache (applet);
+			monitor = monitor_ccache (applet);
 		}
 		ka_dbus_service(applet);
 		gtk_main ();
 	}
 	ka_nm_shutdown();
+	if (monitor)
+		g_object_unref (monitor);
 	return 0;
 }
diff --git a/src/ka-gconf-tools.c b/src/ka-gconf-tools.c
index 60fd567..c7cc711 100644
--- a/src/ka-gconf-tools.c
+++ b/src/ka-gconf-tools.c
@@ -40,8 +40,8 @@ ka_gconf_get_string (GConfClient* client,
 			*value = g_strdup (gconf_value_get_string (gc_value));
 			success = TRUE;
 		} else if (error) {
-				g_print ("%s", error->message);
-				g_error_free (error);
+				g_warning ("%s", error->message);
+				g_clear_error (&error);
 		}
 		gconf_value_free (gc_value);
 	}
@@ -64,8 +64,8 @@ ka_gconf_get_string_list (GConfClient* client,
 	if ((*list = gconf_client_get_list (client, key,
 	                                   GCONF_VALUE_STRING, &error))) {
 		if (error) {
-			g_print ("%s", error->message);
-			g_error_free (error);
+			g_warning ("%s", error->message);
+			g_clear_error (&error);
 		} else
 			success = TRUE;
 	}
@@ -92,8 +92,8 @@ ka_gconf_get_int (GConfClient* client,
 			*value = gconf_value_get_int (gc_value);
 			success = TRUE;
 		} else if (error) {
-				g_print ("%s", error->message);
-				g_error_free (error);
+				g_warning("%s", error->message);
+				g_clear_error (&error);
 		}
 		gconf_value_free (gc_value);
 	}
@@ -119,8 +119,8 @@ ka_gconf_get_bool (GConfClient* client,
 			*value = gconf_value_get_bool (gc_value);
 			success = TRUE;
 		} else if (error) {
-				g_print ("%s", error->message);
-				g_error_free (error);
+				g_warning ("%s", error->message);
+				g_clear_error (&error);
 		}
 		gconf_value_free (gc_value);
 	}
@@ -140,8 +140,8 @@ ka_gconf_set_bool (GConfClient* client,
 
 	if(!gconf_client_set_bool (client, key, value, &error)) {
 		if (error) {
-			g_print ("%s", error->message);
-			g_error_free (error);
+			g_warning ("%s", error->message);
+			g_clear_error (&error);
 		}
 		return FALSE;
 	}
diff --git a/src/ka-gconf.c b/src/ka-gconf.c
index 10ef703..4e3d1aa 100644
--- a/src/ka-gconf.c
+++ b/src/ka-gconf.c
@@ -202,10 +202,10 @@ ka_gconf_init (KaApplet* applet)
 	ka_gconf_set_tgt_renewable(client, applet);
 	ka_gconf_set_tgt_proxiable(client, applet);
 out:
-	if(error) {
+	if (error) {
 		client = NULL;
-		g_print ("%s", error->message);
-		g_error_free (error);
+		g_warning ("%s", error->message);
+		g_clear_error (&error);
 	}
 	return client;
 }
diff --git a/src/ka-pwdialog.c b/src/ka-pwdialog.c
index 2f8463c..da34471 100644
--- a/src/ka-pwdialog.c
+++ b/src/ka-pwdialog.c
@@ -96,7 +96,8 @@ grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
 
 	GdkGrabStatus status;
 	if (!pwdialog->priv->grabbed) {
-		status = gdk_keyboard_grab (win->window, FALSE, gdk_event_get_time (event));
+		status = gdk_keyboard_grab (gtk_widget_get_window (win),
+					    FALSE, gdk_event_get_time (event));
 		if (status == GDK_GRAB_SUCCESS)
 			pwdialog->priv->grabbed = TRUE;
 		else
@@ -123,7 +124,7 @@ ungrab_keyboard (GtkWidget *win G_GNUC_UNUSED,
 static gboolean
 window_state_changed (GtkWidget *win, GdkEventWindowState *event, gpointer data)
 {
-	GdkWindowState state = gdk_window_get_state (win->window);
+	GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (win));
 
 	if (state & GDK_WINDOW_STATE_WITHDRAWN ||
 	    state & GDK_WINDOW_STATE_ICONIFIED ||
diff --git a/src/ka-tools.c b/src/ka-tools.c
index 177e64e..260d101 100644
--- a/src/ka-tools.c
+++ b/src/ka-tools.c
@@ -51,7 +51,7 @@ ka_show_help (GdkScreen* screen, const char* chapter, GtkWindow* window)
                   NULL);
 
       gtk_widget_show (message_dialog);
-      g_error_free (error);
+      g_clear_error (&error);
   }
   g_free (url);
 }
diff --git a/src/krb5-auth-dialog.desktop.in b/src/krb5-auth-dialog.desktop.in
index 653ef3c..6c83b31 100644
--- a/src/krb5-auth-dialog.desktop.in
+++ b/src/krb5-auth-dialog.desktop.in
@@ -1,7 +1,6 @@
 [Desktop Entry]
 _Name=Network Authentication
 _Comment=Kerberos Network Authentication Dialog
-Encoding=UTF-8
 Exec=krb5-auth-dialog
 Terminal=false
 Type=Application
diff --git a/src/krb5-auth-dialog.xml b/src/krb5-auth-dialog.xml
index d379265..0df79ef 100644
--- a/src/krb5-auth-dialog.xml
+++ b/src/krb5-auth-dialog.xml
@@ -6,8 +6,8 @@
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Network Authentication</property>
     <property name="resizable">False</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">normal</property>
+    <property name="window_position">center-always</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">