New upstream version 3.8.0

author: Guido Günther <agx@sigxcpu.org> 2013-03-31 16:24:35 +0200
committer: Guido Günther <agx@sigxcpu.org> 2013-03-31 16:24:35 +0200
commit: 6c66f3c0bfc6c655c53e552ba8ef487700a6e0bc (patch)
tree: ec0da0d6be6e02f3e237ec35743f213df218f7d2
parent: New upstream version 3.2.1 (diff)
download: krb5-auth-dialog-6c66f3c0bfc6c655c53e552ba8ef487700a6e0bc.tar.gz
krb5-auth-dialog-6c66f3c0bfc6c655c53e552ba8ef487700a6e0bc.tar.bz2
krb5-auth-dialog-6c66f3c0bfc6c655c53e552ba8ef487700a6e0bc.zip
64 files changed, 5694 insertions, 4586 deletions
diff --git a/ChangeLog b/ChangeLog
index f246643..c6dfe64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,325 @@
 # Generated by Makefile. Do not edit.
 
+commit 3e9dc1284c6b0f59468457c7c6c786dc3fe66407
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Wed Mar 27 21:41:11 2013 +0100
+
+    Use a 3 digit version number
+
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7f8e4f1f2aa305e76eac5faa02f85cd258fffdfb
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Wed Mar 27 21:32:35 2013 +0100
+
+    Release 3.8
+
+ NEWS         |    5 +++++
+ configure.ac |    2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+commit 80da3657d00d37404dcddb9530584516d0efe7eb
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Mar 25 07:29:05 2013 +0100
+
+    Switch to an app_menu
+    
+    Use GtkApplicationWindow to make this simple.
+
+ src/ka-applet-priv.h    |    1 +
+ src/ka-applet.c         |  120 ++++++++++++++++++++++++++++++++++++++++-------
+ src/ka-main-window.c    |   66 ++++----------------------
+ src/ka-main-window.h    |    2 +-
+ src/ka-preferences.c    |    9 ++--
+ src/ka-preferences.h    |    2 +-
+ src/ka-tools.c          |    6 ++-
+ src/ka-tools.h          |    3 +-
+ src/krb5-auth-dialog.ui |  115 ++++++++++-----------------------------------
+ 9 files changed, 151 insertions(+), 173 deletions(-)
+
+commit f238a8e7bc89c22ce9d39e4be737579062afb425
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Mar 24 18:31:43 2013 +0100
+
+    Update for GTK+3
+
+ src/krb5-auth-dialog.ui |   20 ++------------------
+ 1 file changed, 2 insertions(+), 18 deletions(-)
+
+commit 00ea8cd15602842f28dcad84ffaee4b952a8a1a5
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Mar 17 15:57:34 2013 +0100
+
+    Bump version to 3.7.92
+
+ NEWS         |   19 +++++++++++++++++++
+ configure.ac |    2 +-
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+
+commit f46e80ba5ee7be34b31c2cb9fb97f359bea7c14e
+Author: Martin Srebotnjak <miles@filmsi.net>
+Date:   Sat Mar 16 20:13:39 2013 +0100
+
+    Updated Slovenian translation
+
+ po/sl.po |   87 +++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 47 insertions(+), 40 deletions(-)
+
+commit eab1be20197418e3ba3795a931ec30eac7e3dca5
+Author: Rafael Ferreira <rafael.f.f1@gmail.com>
+Date:   Sat Mar 16 14:42:07 2013 -0300
+
+    Updated Brazilian Portuguese translation
+
+ po/pt_BR.po |  137 +++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 73 insertions(+), 64 deletions(-)
+
+commit 7f2bb5af6272060b63243fd9a69d7a6199da9b33
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat Mar 16 16:37:21 2013 +0100
+
+    Hide configuration tickets by default
+    
+    Based on a patch by Mantas Mikulėnas
+    BZ: #649830
+
+ src/ka-applet-priv.h                    |    1 +
+ src/ka-applet.c                         |   31 +++++++++++++++++++++++++++----
+ src/ka-kerberos.c                       |   18 +++++++++++-------
+ src/ka-kerberos.h                       |    3 ++-
+ src/ka-main-window.c                    |   16 +++++++++++-----
+ src/ka-main-window.h                    |    2 +-
+ src/ka-settings.c                       |    1 +
+ src/ka-settings.h                       |    1 +
+ src/org.gnome.KrbAuthDialog.gschema.xml |    5 +++++
+ 9 files changed, 60 insertions(+), 18 deletions(-)
+
+commit bf7fc622bc91d53e6fb51e0420272050eba79314
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat Mar 16 17:09:11 2013 +0100
+
+    Reformat
+
+ src/ka-kerberos.c |    9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+commit 4047d40116e7dfcd71e2c300c04470b447bdfd05
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sat Mar 16 14:27:20 2013 +0100
+
+    Use KA_PROP_NAME_* instead of hardcoded strings
+
+ src/ka-kerberos.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+commit c806871f7fb5916078dd707fbfd124f4a188f039
+Author: Martin Srebotnjak <miles@filmsi.net>
+Date:   Sat Mar 16 09:47:43 2013 +0100
+
+    Updated Slovenian translation
+
+ po/sl.po |  126 ++++++++++++++++++++++----------------------------------------
+ 1 file changed, 45 insertions(+), 81 deletions(-)
+
+commit 58cd616fca3a1b13789fe951256b5f7378bf7183
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Fri Mar 15 19:10:56 2013 +0100
+
+    Use gdk_device_{un,}grab
+    
+    instead of the deprecated gdk_keyboard_{un,}grab
+
+ src/ka-pwdialog.c |   66 +++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 59 insertions(+), 7 deletions(-)
+
+commit aeb7f423b575d0aeb928e38bff492c2f5894f9fa
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Feb 20 21:54:30 2012 +0100
+
+    Move from GConf to GSettings
+
+ README                                  |   54 +++-
+ configure.ac                            |   10 +-
+ etpo/Makefile.am                        |    2 -
+ po/POTFILES.in                          |    2 +-
+ src/.gitignore                          |    1 +
+ src/Makefile.am                         |   27 +-
+ src/ka-applet-priv.h                    |   11 +-
+ src/ka-applet.c                         |   77 +++--
+ src/ka-gconf-tools.c                    |  149 ----------
+ src/ka-gconf-tools.h                    |   48 ----
+ src/ka-gconf.c                          |  195 -------------
+ src/ka-gconf.h                          |   29 --
+ src/ka-kerberos.c                       |    2 +-
+ src/ka-plugin-loader.c                  |   27 +-
+ src/ka-preferences.c                    |  467 +++++++++++--------------------
+ src/ka-preferences.h                    |    2 +
+ src/ka-settings.c                       |   58 ++++
+ src/ka-settings.h                       |   43 +++
+ src/krb5-auth-dialog.schemas.in         |  146 ----------
+ src/org.gnome.KrbAuthDialog.convert     |   13 +
+ src/org.gnome.KrbAuthDialog.gschema.xml |   65 +++++
+ 21 files changed, 463 insertions(+), 965 deletions(-)
+
+commit 50451b28716e74612152511af44771f761b61c49
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Wed Mar 13 21:17:59 2013 +0100
+
+    Version bump
+
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 2280349ada1ad05c3d06271f248deca4f26ded54
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Feb 20 21:45:14 2012 +0100
+
+    Switch to xz tarballs
+
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d58cf028b7b3b330e444c2abc41cfa574a043268
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Feb 17 16:43:04 2013 +0100
+
+    Chain up on startup signal
+
+ src/ka-applet.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 502027b2fd9b14d7afa79c6b1f0df627a4a9acc6
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Feb 17 13:11:04 2013 +0100
+
+    Set hint to allow the shell to filter by application
+    
+    https://live.gnome.org/GnomeGoals/NotificationSource
+
+ src/ka-applet.c                 |    8 +++++++-
+ src/krb5-auth-dialog.desktop.in |    1 +
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+commit 6dfd23acce6fa37d0a5442a454f0d0f1d35ee716
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Feb 17 13:18:03 2013 +0100
+
+    Cleanup whitespace
+
+ src/ka-applet.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+commit 8e540f25293802309b0b8ec3462f304c9055425e
+Author: Enrico Nicoletto <liverig@gmail.com>
+Date:   Sun Feb 10 00:05:01 2013 -0200
+
+    Updated Brazilian Portuguese translation
+
+ po/pt_BR.po |  552 ++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 299 insertions(+), 253 deletions(-)
+
+commit 5510e8b0c8a2e905842962ef059b7e01a6fae24a
+Author: Marek Černocký <marek@manet.cz>
+Date:   Tue Jan 29 18:17:43 2013 +0100
+
+    Updated Czech translation
+
+ po/cs.po |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit cddd9d16074ea8c355821df7c486b87b388bd539
+Author: Marek Černocký <marek@manet.cz>
+Date:   Tue Jan 29 00:24:43 2013 +0100
+
+    Updated Czech translation
+
+ po/cs.po |  116 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 58 insertions(+), 58 deletions(-)
+
+commit 1b3761ac09cbfa368868c39cc335c274799f6f67
+Author: Zdeněk Hataš <zdenek.hatas@gmail.com>
+Date:   Fri Nov 9 12:04:12 2012 +0100
+
+    Updated Czech translation
+
+ po/cs.po |  319 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 162 insertions(+), 157 deletions(-)
+
+commit 1bbe1eec409d0b9df58c41bcc9296276ed71eb42
+Author: Daniel Winzen <d@winzen4.de>
+Date:   Thu Nov 8 17:54:58 2012 +0100
+
+    Updated German help translation
+
+ help/de/de.po |   16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+commit eaeba86724f410d92d3631a1388b3608a18cb1bf
+Author: Marek Černocký <marek@manet.cz>
+Date:   Tue Oct 2 22:29:04 2012 +0200
+
+    Updated Czech translation
+
+ po/cs.po |   89 ++++++++++++++++++++++++++++----------------------------------
+ 1 file changed, 40 insertions(+), 49 deletions(-)
+
+commit b91bb96964812acb1241ad298bf52702c2e2bcf2
+Author: Fran Diéguez <fran.dieguez@mabishu.com>
+Date:   Thu Aug 30 14:41:41 2012 +0200
+
+    Updated Galician translations
+
+ po/gl.po |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit ea7f6c3ef186cd43ca879f9c6014b56291c179e9
+Author: Bruno Brouard <annoa.b@gmail.com>
+Date:   Sun Jun 3 00:17:29 2012 +0200
+
+    Updated French translation
+
+ po/fr.po |  313 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 158 insertions(+), 155 deletions(-)
+
+commit 9109ec49c77b1daa2d9d9b85440bdbc8da1607c1
+Author: Matej Urbančič <mateju@svn.gnome.org>
+Date:   Mon May 28 14:58:41 2012 +0200
+
+    Updated Slovenian translation
+
+ po/sl.po |  289 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 146 insertions(+), 143 deletions(-)
+
+commit 86a06ecad9849a4ca5508cf7cfdbcede89cdf15d
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:   Sun May 27 12:30:05 2012 +0200
+
+    Updated Spanish translation
+
+ po/es.po |  446 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 223 insertions(+), 223 deletions(-)
+
+commit 771275702e1802b7150b9903c8ad915f604cc746
+Author: Antoine Jacoutot <ajacoutot@gnome.org>
+Date:   Fri May 25 16:24:11 2012 +0200
+
+    typo: credentails -> credentials
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=676809
+
+ src/ka-applet.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 61bc6c38d4938f6c4b7938f98978538421503e7f
+Author: Fran Diéguez <fran.dieguez@mabishu.com>
+Date:   Sat Mar 24 00:12:35 2012 +0100
+
+    Updated Galician translations
+
+ po/gl.po |  460 ++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 237 insertions(+), 223 deletions(-)
+
 commit f7414096623e564d9d26794b7cc1cb3ab680929d
 Author: Guido Günther <agx@sigxcpu.org>
 Date:   Sun Oct 16 18:41:00 2011 +0200
@@ -8,7 +328,7 @@ Date:   Sun Oct 16 18:41:00 2011 +0200
 
  NEWS         |   13 +++++++++++++
  configure.ac |    2 +-
- 2 files changed, 14 insertions(+), 1 deletions(-)
+ 2 files changed, 14 insertions(+), 1 deletion(-)
 
 commit 9f435e2c60a8bea0c196be393125f6f8767e7afd
 Author: Guido Günther <agx@sigxcpu.org>
@@ -17,7 +337,7 @@ Date:   Sun Oct 16 18:51:18 2011 +0200
     Remove cc-panel/
 
  cc-panel/.gitignore |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 1 file changed, 2 deletions(-)
 
 commit aba3a821e5ea990701ca060bcc1ee40eb0d884ca
 Author: Zdeněk Hataš <zdenek.hatas@gmail.com>
@@ -26,7 +346,7 @@ Date:   Tue Oct 4 11:38:35 2011 +0200
     Updated Czech translation
 
  po/cs.po |  501 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 252 insertions(+), 249 deletions(-)
+ 1 file changed, 252 insertions(+), 249 deletions(-)
 
 commit 5096ce0e7364523e85ccee9da224133a7a5354bf
 Author: Claude Paroz <claude@2xlibre.net>
@@ -35,7 +355,7 @@ Date:   Sat Oct 1 23:20:37 2011 +0200
     Updated French translation
 
  po/fr.po |  353 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 176 insertions(+), 177 deletions(-)
+ 1 file changed, 176 insertions(+), 177 deletions(-)
 
 commit feea4b3e8b0ac9a2b7d61653f13dd7531245584e
 Author: Daniel Mustieles <daniel.mustieles@gmail.com>
@@ -44,7 +364,7 @@ Date:   Sat Oct 1 11:48:06 2011 +0200
     Updated Spanish translation
 
  help/es/es.po |   31 ++++++++++++++-----------------
- 1 files changed, 14 insertions(+), 17 deletions(-)
+ 1 file changed, 14 insertions(+), 17 deletions(-)
 
 commit 7f943685c00ea659b732c81e56ff5e5b831db5eb
 Author: Zdenek Hatas <zdenek.hatas@gmail.com>
@@ -56,7 +376,7 @@ Date:   Thu Sep 29 16:12:19 2011 +0200
     Signed-off-by: Guido Günther <agx@sigxcpu.org>
 
  help/C/krb5-auth-dialog.xml |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 15fde0ec01fd3c55e886e077e3a8dcd2c24fd02c
 Author: Guido Günther <agx@sigxcpu.org>
@@ -79,7 +399,7 @@ Date:   Tue Sep 27 11:52:37 2011 +0200
     BZ: #660227
 
  src/krb5-auth-dialog.desktop.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 1c89fe8b203c85dcb4ff06fb8da34e411eb56730
 Author: Guido Günther <agx@sigxcpu.org>
@@ -89,7 +409,7 @@ Date:   Mon Sep 26 22:13:36 2011 +0200
 
  NEWS         |   13 +++++++++++++
  configure.ac |    2 +-
- 2 files changed, 14 insertions(+), 1 deletions(-)
+ 2 files changed, 14 insertions(+), 1 deletion(-)
 
 commit 72886265ec4f518e32ef178cea806b336844ecec
 Author: Guido Günther <agx@sigxcpu.org>
@@ -98,7 +418,7 @@ Date:   Mon Sep 26 22:06:12 2011 +0200
     Avoid crash by not settings string columns to 0
 
  src/ka-kerberos.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 1 file changed, 2 deletions(-)
 
 commit 42eaa5d3e594b69a555423e2a7c2c04fcb25465d
 Author: Mario Blättermann <mariobl@gnome.org>
@@ -107,7 +427,7 @@ Date:   Mon Sep 19 21:52:10 2011 +0200
     [l10n] Updated German translation
 
  po/de.po |  358 ++++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 183 insertions(+), 175 deletions(-)
+ 1 file changed, 183 insertions(+), 175 deletions(-)
 
 commit 8efd67bb6f69ee690ea51f48a37d21cdc766e2c2
 Author: Guido Günther <agx@sigxcpu.org>
@@ -116,7 +436,7 @@ Date:   Thu Sep 15 12:25:21 2011 +0200
     autogen.sh: look for ka-kerberos.c
 
  autogen.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bbe15a3a7c0d5154332e64a3bb7fbe2367056400
 Author: Guido Günther <agx@sigxcpu.org>
@@ -125,7 +445,7 @@ Date:   Mon Sep 12 16:34:37 2011 +0200
     Add translator hints
 
  src/ka-main-window.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
 commit 9266c74980f52605d039cc0b6530c0a17917f6e2
 Author: Guido Günther <agx@sigxcpu.org>
@@ -135,8 +455,8 @@ Date:   Mon Sep 12 12:23:13 2011 +0200
     
     since GtkApplication is 3.0 only
 
- configure.ac |   30 +++++-------------------------
- 1 files changed, 5 insertions(+), 25 deletions(-)
+ configure.ac |   32 ++++++--------------------------
+ 1 file changed, 6 insertions(+), 26 deletions(-)
 
 commit d8efe4a8fe5152f8c53c005fb0830ef80fce8a9d
 Author: Guido Günther <agx@sigxcpu.org>
@@ -145,7 +465,7 @@ Date:   Mon Sep 12 12:16:50 2011 +0200
     Don't try to free invalid context
 
  src/ka-kerberos.c |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit 25d0d29c28cc7b6038a441f8f1ca97deefcd14db
 Author: Guido Günther <agx@sigxcpu.org>
@@ -187,7 +507,7 @@ Date:   Sat Sep 10 14:57:34 2011 +0200
     since we now use it to edit the prefs.
 
  src/krb5-auth-dialog.desktop.in |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 commit adc616b490faccbec37aed550002b3e3f8b0169c
 Author: Guido Günther <agx@sigxcpu.org>
@@ -195,7 +515,7 @@ Date:   Sun Sep 11 14:49:24 2011 +0200
 
     Show main window when krb5-auth-dialog is invoked again
 
- src/ka-applet.c |  107 ++++++++++++++++++++++++++++++++++++++++++++++++------
+ src/ka-applet.c |  107 ++++++++++++++++++++++++++++++++++++++++++++++++-------
  src/ka-dialog.c |   61 ++++++++++++-------------------
  2 files changed, 118 insertions(+), 50 deletions(-)
 
@@ -232,8 +552,8 @@ Date:   Fri Sep 9 12:01:57 2011 +0200
 
     Updated Czech translation
 
- po/cs.po |  202 +++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 103 insertions(+), 99 deletions(-)
+ po/cs.po |  202 ++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 103 insertions(+), 99 deletions(-)
 
 commit 8b53aed4c6ae13782b68b51fbdafba83f2da61f8
 Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
@@ -242,7 +562,7 @@ Date:   Wed Sep 7 21:28:35 2011 +0200
     Updated Slovenian translation
 
  po/sl.po |  329 ++++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 169 insertions(+), 160 deletions(-)
+ 1 file changed, 169 insertions(+), 160 deletions(-)
 
 commit 9687ba4ba4c547436a122f21129bc6251a8b4a49
 Author: Vincent Untz <vuntz@gnome.org>
@@ -253,7 +573,7 @@ Date:   Tue Sep 6 16:36:32 2011 +0200
     https://bugzilla.gnome.org/show_bug.cgi?id=658364
 
  configure.ac |    8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
+ 1 file changed, 8 deletions(-)
 
 commit 1fec2e02597926de3921da4b462610779a1333bf
 Author: Guido Günther <agx@sigxcpu.org>
@@ -263,7 +583,7 @@ Date:   Tue Sep 6 12:37:28 2011 +0200
 
  NEWS         |   12 ++++++++++++
  configure.ac |    2 +-
- 2 files changed, 13 insertions(+), 1 deletions(-)
+ 2 files changed, 13 insertions(+), 1 deletion(-)
 
 commit becb3cadc883efcd444b9ffbccdd5ac535062feb
 Author: Guido Günther <agx@sigxcpu.org>
@@ -272,7 +592,7 @@ Date:   Tue Sep 6 10:53:37 2011 +0200
     Remove items moved to ticket dialog
 
  src/ka-applet.c |   50 +-------------------------------------------------
- 1 files changed, 1 insertions(+), 49 deletions(-)
+ 1 file changed, 1 insertion(+), 49 deletions(-)
 
 commit 3fe50f6c8450f1eb38dbb249c89b92ff51032ed3
 Author: Guido Günther <agx@sigxcpu.org>
@@ -305,8 +625,8 @@ Date:   Mon Sep 5 13:54:59 2011 +0200
 
     Updated Spanish translation
 
- po/es.po |   81 ++++++++++++++++++++++++++++++++++---------------------------
- 1 files changed, 45 insertions(+), 36 deletions(-)
+ po/es.po |   81 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 45 insertions(+), 36 deletions(-)
 
 commit 030d15751d0ab74b0624680f696248747fd1d562
 Author: Guido Günther <agx@sigxcpu.org>
@@ -326,7 +646,7 @@ Date:   Sun Sep 4 19:05:08 2011 +0200
 
     Add menu bar to main window
 
- src/ka-main-window.c    |   64 +++++++++++++-
+ src/ka-main-window.c    |   64 ++++++++++++--
  src/ka-main-window.h    |    2 +-
  src/krb5-auth-dialog.ui |  211 +++++++++++++++++++++++++++++++++++++----------
  3 files changed, 226 insertions(+), 51 deletions(-)
@@ -338,7 +658,7 @@ Date:   Sun Sep 4 19:20:12 2011 +0200
     Name callbacks consistently
 
  src/ka-applet.c |   24 ++++++++++++------------
- 1 files changed, 12 insertions(+), 12 deletions(-)
+ 1 file changed, 12 insertions(+), 12 deletions(-)
 
 commit 53dfb8407380dd82d32f80c5deed39da1f982cfa
 Author: Guido Günther <agx@sigxcpu.org>
@@ -372,7 +692,7 @@ Date:   Sun Sep 4 15:31:44 2011 +0200
  src/ka-main-window.h    |   40 +++++++++++++++
  src/ka-tickets.c        |  116 --------------------------------------------
  src/ka-tickets.h        |   39 ---------------
- src/krb5-auth-dialog.ui |   61 +++++-------------------
+ src/krb5-auth-dialog.ui |   61 +++++------------------
  9 files changed, 184 insertions(+), 213 deletions(-)
 
 commit 371720a2b70b968dfcaaf5b7de0d0826c985a050
@@ -382,7 +702,7 @@ Date:   Sun Sep 4 16:05:54 2011 +0200
     Connect GtkBuilder signals
 
  src/ka-applet.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 8c1a20fbfee1c1ed6ad3002e169c939ad9e87477
 Author: Fran Dieguez <fran@openhost.es>
@@ -391,7 +711,7 @@ Date:   Tue Aug 16 23:00:21 2011 +0200
     Updated Galician translations
 
  po/gl.po |  293 +++++++++++++++++++++++++++++++++++---------------------------
- 1 files changed, 166 insertions(+), 127 deletions(-)
+ 1 file changed, 166 insertions(+), 127 deletions(-)
 
 commit 7a7a51829f6fa07470f311b8d090569a9845c791
 Author: Aron Xu <aronxu@gnome.org>
@@ -399,8 +719,8 @@ Date:   Tue Aug 16 15:22:10 2011 +0000
 
     Update Simplified Chinese translation.
 
- po/zh_CN.po |  413 +++++++++++++++++++++++++++++++---------------------------
- 1 files changed, 221 insertions(+), 192 deletions(-)
+ po/zh_CN.po |  413 ++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 221 insertions(+), 192 deletions(-)
 
 commit f12286399ca209b31ca17d4162fbf99ed6968b36
 Author: Petr Kovar <pkovar@redhat.com>
@@ -409,7 +729,7 @@ Date:   Fri Jun 10 15:57:05 2011 +0200
     Fix Czech translation
 
  po/cs.po |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 905cb444e01794557d038c4547d483a18f2a46cf
 Author: Petr Kovar <pkovar@redhat.com>
@@ -418,7 +738,7 @@ Date:   Fri Jun 10 15:52:51 2011 +0200
     Update Czech translation by Zdenek Hatas
 
  po/cs.po |  347 +++++++++++++++++++++++++++++++++-----------------------------
- 1 files changed, 187 insertions(+), 160 deletions(-)
+ 1 file changed, 187 insertions(+), 160 deletions(-)
 
 commit 2b27db7f8d18d7d6d473a1efd093a1fe0e646981
 Author: Guido Günther <agx@sigxcpu.org>
@@ -428,7 +748,7 @@ Date:   Sun Apr 24 15:56:52 2011 +0200
 
  NEWS         |   10 ++++++++++
  configure.ac |    2 +-
- 2 files changed, 11 insertions(+), 1 deletions(-)
+ 2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit 47736eaea5871d835eb951640b0baa5c350c4060
 Author: Guido Günther <agx@sigxcpu.org>
@@ -450,8 +770,8 @@ Date:   Thu Apr 21 17:36:17 2011 +0200
 
     Updated French translation
 
- po/fr.po |  122 +++++++++++++++++++++++++++++++++++++------------------------
- 1 files changed, 74 insertions(+), 48 deletions(-)
+ po/fr.po |  122 +++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 74 insertions(+), 48 deletions(-)
 
 commit e75b2be5f1f8a6d1410a6ea5c37217c9e29513c1
 Author: Joe Hansen <joedalton2@yahoo.dk>
@@ -459,8 +779,8 @@ Date:   Wed Apr 6 22:33:14 2011 +0200
 
     Updated Danish translation
 
- po/da.po |  126 +++++++++++++++++++++++++++++++++++++------------------------
- 1 files changed, 76 insertions(+), 50 deletions(-)
+ po/da.po |  126 +++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 76 insertions(+), 50 deletions(-)
 
 commit 46edaee71f066bc961e319e0d589a15d44f97192
 Author: Matej Urbančič <mateju@svn.gnome.org>
@@ -469,7 +789,7 @@ Date:   Wed Apr 6 12:32:04 2011 +0200
     Updated Slovenian translation
 
  po/sl.po |   46 ++++++++++++++++++++++++++++------------------
- 1 files changed, 28 insertions(+), 18 deletions(-)
+ 1 file changed, 28 insertions(+), 18 deletions(-)
 
 commit 704323a748cb19e177d9000f286e24eabea0c115
 Author: Daniel Mustieles <daniel.mustieles@gmail.com>
@@ -478,7 +798,7 @@ Date:   Mon Apr 4 19:53:01 2011 +0200
     Updated Spanish translation
 
  po/es.po |   35 ++++++++++++++++++++---------------
- 1 files changed, 20 insertions(+), 15 deletions(-)
+ 1 file changed, 20 insertions(+), 15 deletions(-)
 
 commit 048b63e48ac57a63ecb3759f0a58c431ee09bf4f
 Author: Guido Günther <agx@sigxcpu.org>
@@ -488,7 +808,7 @@ Date:   Mon Apr 4 15:20:33 2011 +0200
 
  NEWS         |   11 +++++++++++
  configure.ac |    2 +-
- 2 files changed, 12 insertions(+), 1 deletions(-)
+ 2 files changed, 12 insertions(+), 1 deletion(-)
 
 commit b9431bc950ff61e0985abd106b4a68402376b355
 Author: Guido Günther <agx@sigxcpu.org>
@@ -503,7 +823,7 @@ Date:   Fri Apr 1 18:35:44 2011 +0200
     DBusException: org.freedesktop.DBus.Error.UnknownMethod: No such interface `org.gnome.KrbAuthDialog' on object at path /org/gnome/KrbAuthDialog
 
  src/ka-dbus.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit a5b7c21fba6f99afb768604a20fe394edee9dd16
 Author: Guido Günther <agx@sigxcpu.org>
@@ -512,7 +832,7 @@ Date:   Fri Apr 1 17:54:28 2011 +0200
     Remove superfluous default argument
 
  src/org.gnome.KrbAuthDialog.service.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 94643b1b79172860c09efcfe8be874170f69562d
 Author: Guido Günther <agx@sigxcpu.org>
@@ -521,7 +841,7 @@ Date:   Fri Apr 1 16:11:36 2011 +0200
     Update copyright and comments
 
  src/ka-applet.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 6dbcd27838a820d98421af9cdbe9955d1d003902
 Author: Mario Blättermann <mariobl@gnome.org>
@@ -530,7 +850,7 @@ Date:   Thu Mar 31 22:37:50 2011 +0200
     [l10n] Updated German translation
 
  po/de.po |  268 ++++++++++++++++++++++++++++++--------------------------------
- 1 files changed, 131 insertions(+), 137 deletions(-)
+ 1 file changed, 131 insertions(+), 137 deletions(-)
 
 commit cdc8fd453e1c4fc52472409eadb5a61d616c240b
 Author: Guido Günther <agx@sigxcpu.org>
@@ -539,7 +859,7 @@ Date:   Wed Mar 30 15:25:55 2011 +0200
     Simplify by using gtk_tree_view_insert_column_with_attributes
 
  src/ka-tickets.c |   72 +++++++++++++++++++++++++++---------------------------
- 1 files changed, 36 insertions(+), 36 deletions(-)
+ 1 file changed, 36 insertions(+), 36 deletions(-)
 
 commit 5ec9b6df318c816f3d1ff1604baba5f6a3a0dc2b
 Author: Guido Günther <agx@sigxcpu.org>
@@ -548,7 +868,7 @@ Date:   Wed Mar 30 15:04:01 2011 +0200
     Ignore generated bz2 files
 
  .gitignore |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 2d61d9a54da71c87d6f6837eb5fb5db883aafe73
 Author: Guido Günther <agx@sigxcpu.org>
@@ -561,7 +881,7 @@ Date:   Wed Mar 30 14:58:31 2011 +0200
     just reporting the current status.
 
  src/ka-applet.c |   13 +++++++++----
- 1 files changed, 9 insertions(+), 4 deletions(-)
+ 1 file changed, 9 insertions(+), 4 deletions(-)
 
 commit aa02873b65668c69067090041af3803fc753b239
 Author: Guido Günther <agx@sigxcpu.org>
@@ -570,7 +890,7 @@ Date:   Wed Mar 30 14:03:53 2011 +0200
     Fix description for translators
 
  cc-panel/gnome-ka-panel.desktop.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 589643460d363128ca5ef268aa49d0501bf65206
 Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
@@ -579,7 +899,7 @@ Date:   Tue Mar 29 16:16:32 2011 +0200
     Updated Slovenian translation
 
  po/sl.po |  158 ++++++++++++++++++++++++++++++++++----------------------------
- 1 files changed, 86 insertions(+), 72 deletions(-)
+ 1 file changed, 86 insertions(+), 72 deletions(-)
 
 commit 9cf49075f942fb0ae67685458bedca8ef0449912
 Author: Kjartan Maraas <kmaraas@gnome.org>
@@ -587,8 +907,8 @@ Date:   Mon Mar 28 20:39:34 2011 +0200
 
     Updated Norwegian bokmål translation
 
- po/nb.po |  260 +++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 132 insertions(+), 128 deletions(-)
+ po/nb.po |  260 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 132 insertions(+), 128 deletions(-)
 
 commit 378378f939868df01669042d1a5f8e1541950b10
 Author: Daniel Mustieles <daniel.mustieles@gmail.com>
@@ -597,7 +917,7 @@ Date:   Mon Mar 28 19:07:48 2011 +0200
     Updated Spanish translation
 
  po/es.po |   15 +++++++--------
- 1 files changed, 7 insertions(+), 8 deletions(-)
+ 1 file changed, 7 insertions(+), 8 deletions(-)
 
 commit 8c28c8a6500fa28426a493c1c26039a0c2668d93
 Author: Guido Günther <agx@sigxcpu.org>
@@ -606,7 +926,7 @@ Date:   Sun Mar 27 22:15:22 2011 +0200
     Add bug-database and download-page
 
  krb5-auth-dialog.doap |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 8c192286510afa28b056317321b062f107d6f994
 Author: Guido Günther <agx@sigxcpu.org>
@@ -615,7 +935,7 @@ Date:   Sun Mar 27 22:08:55 2011 +0200
     Add description to doap file
 
  krb5-auth-dialog.doap |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ 1 file changed, 7 insertions(+)
 
 commit 3504c98b48de8abd16d9331c332a0fed09803b2f
 Author: Guido Günther <agx@sigxcpu.org>
@@ -625,7 +945,7 @@ Date:   Sat Mar 26 08:46:35 2011 +0100
 
  NEWS         |   11 +++++++++++
  configure.ac |    2 +-
- 2 files changed, 12 insertions(+), 1 deletions(-)
+ 2 files changed, 12 insertions(+), 1 deletion(-)
 
 commit 585d63c4c7cbe0276c7d343d1c57df9518fb3867
 Author: Guido Günther <agx@sigxcpu.org>
@@ -634,7 +954,7 @@ Date:   Sat Mar 26 08:31:51 2011 +0100
     Indicate empty ticket cache
 
  src/ka-dialog.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ 1 file changed, 8 insertions(+)
 
 commit 1256147f9922196ff477f3c9b24fe20ec120994c
 Author: Daniel Mustieles <daniel.mustieles@gmail.com>
@@ -643,7 +963,7 @@ Date:   Fri Mar 25 19:28:29 2011 +0100
     Updated Spanish translation
 
  po/es.po |  110 +++++++++++++++++++++++++++++++++++++++-----------------------
- 1 files changed, 69 insertions(+), 41 deletions(-)
+ 1 file changed, 69 insertions(+), 41 deletions(-)
 
 commit c00a691f07b9b97ed41d309627e0aa59afb32858
 Author: Guido Günther <agx@sigxcpu.org>
@@ -656,7 +976,7 @@ Date:   Wed Mar 23 15:03:13 2011 +0100
     This is already spelled out in the details of the notification.
 
  src/ka-applet.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit e4ae7390b0bd23b367144424538fa2619d46136c
 Author: Guido Günther <agx@sigxcpu.org>
@@ -667,7 +987,7 @@ Date:   Wed Mar 23 14:03:55 2011 +0100
     Only few users will need them.
 
  cc-panel/ka-panel.ui |  514 ++++++++++++++++++++++++++++++++------------------
- 1 files changed, 333 insertions(+), 181 deletions(-)
+ 1 file changed, 333 insertions(+), 181 deletions(-)
 
 commit 364529f063b6fbd051d92a4732a477280f51abc0
 Author: Daniel Mustieles <daniel.mustieles@gmail.com>
@@ -676,7 +996,7 @@ Date:   Tue Mar 22 21:06:13 2011 +0100
     Updated Spanish translation
 
  po/es.po |  139 ++++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 72 insertions(+), 67 deletions(-)
+ 1 file changed, 72 insertions(+), 67 deletions(-)
 
 commit da08ed170f9d668e72c153ff52bb4bcc278feb4a
 Author: Guido Günther <agx@sigxcpu.org>
@@ -685,7 +1005,7 @@ Date:   Mon Mar 21 21:49:07 2011 +0100
     Call it "Kerberos Authentication" consistently
 
  src/ka-applet.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 7e4ca4889c40e011894b9a809e1f45b62e43e8f3
 Author: Guido Günther <agx@sigxcpu.org>
@@ -694,7 +1014,7 @@ Date:   Mon Mar 21 21:48:22 2011 +0100
     There's no tray icon in GNOME3
 
  krb5-auth-dialog.doap |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0e84bb13c18534c9f77e73bc7f9a5464bedeb4f0
 Author: Bruno Brouard <annoa.b@gmail.com>
@@ -703,7 +1023,7 @@ Date:   Sun Mar 20 11:41:52 2011 +0100
     Updated French translation
 
  po/fr.po |  112 ++++++++++++++++++++++++++++++--------------------------------
- 1 files changed, 54 insertions(+), 58 deletions(-)
+ 1 file changed, 54 insertions(+), 58 deletions(-)
 
 commit 27caa1d56d488b45527d44cd996bb2f6a897868e
 Author: Bruno Brouard <annoa.b@gmail.com>
@@ -711,8 +1031,8 @@ Date:   Sun Mar 20 11:38:06 2011 +0100
 
     Updated French translation
 
- po/fr.po |  140 +++++++++++++++++++++++++++----------------------------------
- 1 files changed, 62 insertions(+), 78 deletions(-)
+ po/fr.po |  140 ++++++++++++++++++++++++++++----------------------------------
+ 1 file changed, 62 insertions(+), 78 deletions(-)
 
 commit 658eced9ec3a2cd5a72cdf8ffd4da711030eb6ee
 Author: Guido Günther <agx@sigxcpu.org>
@@ -721,7 +1041,7 @@ Date:   Wed Mar 2 18:01:23 2011 +0100
     Beautify cc-panel a bit
 
  cc-panel/ka-panel.ui |   17 +++++++++--------
- 1 files changed, 9 insertions(+), 8 deletions(-)
+ 1 file changed, 9 insertions(+), 8 deletions(-)
 
 commit ceadb0d569528de606dcea73f058cba788deb5e7
 Author: Joe Hansen <joedalton2@yahoo.dk>
@@ -730,7 +1050,7 @@ Date:   Sun Mar 13 12:04:10 2011 +0100
     Updated Danish translation
 
  po/da.po | 1717 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1717 insertions(+), 0 deletions(-)
+ 1 file changed, 1717 insertions(+)
 
 commit 31f12bba6f30571de7474046c10988b747a9b828
 Author: Kenneth Nielsen <k.nielsen81@gmail.com>
@@ -739,7 +1059,7 @@ Date:   Sun Mar 13 12:04:09 2011 +0100
     Added da to list of languages
 
  po/LINGUAS |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 3deb396641e2e28a6637d3f57af27aebfd7882a8
 Author: Dan Williams <dcbw@redhat.com>
@@ -750,7 +1070,7 @@ Date:   Mon Mar 7 22:41:28 2011 -0600
     Fix up the defines a bit for additional NM 0.9 states.
 
  src/ka-dialog.c |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
+ 1 file changed, 13 insertions(+)
 
 commit 153d4059b999bddc60a12f0bb960fdbeff24c477
 Author: Guido Günther <agx@sigxcpu.org>
@@ -759,7 +1079,7 @@ Date:   Mon Mar 7 18:55:52 2011 +0100
     Run autoupdate and switch to bzip2
 
  configure.ac |   21 ++++++++++-----------
- 1 files changed, 10 insertions(+), 11 deletions(-)
+ 1 file changed, 10 insertions(+), 11 deletions(-)
 
 commit 461783f5ff6469a1e0803954e120394cc3172afd
 Author: Guido Günther <agx@sigxcpu.org>
@@ -769,7 +1089,7 @@ Date:   Mon Mar 7 18:26:50 2011 +0100
 
  NEWS         |    6 ++++++
  configure.ac |    2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
+ 2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit ce202b6975ff0390ac2ef56d2f24f5f15b56c384
 Author: Guido Günther <agx@sigxcpu.org>
@@ -786,7 +1106,7 @@ Date:   Fri Feb 25 23:09:22 2011 +0100
  src/Makefile.am         |   14 ---
  src/ka-applet-priv.h    |    5 +
  src/ka-applet.c         |   28 ++++--
- src/ka-dbus.c           |  249 +++++++++++++++++++++++++++++++++++-----------
+ src/ka-dbus.c           |  249 +++++++++++++++++++++++++++++++++++------------
  src/ka-dbus.h           |   12 +--
  src/ka-dbus.xml         |   30 ------
  src/ka-dialog.c         |   15 ++-
@@ -799,10 +1119,10 @@ Date:   Thu Feb 24 21:59:36 2011 +0100
     Reindent according to CodingStyle
 
  CodingStyle       |    5 +-
- src/ka-dbus.c     |  134 +++---
+ src/ka-dbus.c     |  134 +++--
  src/ka-dbus.h     |   12 +-
  src/ka-dialog.c   | 1509 ++++++++++++++++++++++++++---------------------------
- src/ka-pwdialog.c |  403 ++++++++-------
+ src/ka-pwdialog.c |  403 +++++++-------
  src/ka-pwdialog.h |   21 +-
  src/ka-tickets.c  |  147 +++---
  src/ka-tickets.h  |   18 +-
@@ -817,7 +1137,7 @@ Date:   Sun Feb 27 15:43:16 2011 +0100
  examples/Makefile.am       |    2 ++
  examples/destroy-ccache.py |    8 ++++++++
  examples/tgt-acquire.py    |    8 ++++++++
- 3 files changed, 18 insertions(+), 0 deletions(-)
+ 3 files changed, 18 insertions(+)
 
 commit 1824f443fcd94b2cce375d3f3b3d1636230e332b
 Author: Guido Günther <agx@sigxcpu.org>
@@ -839,7 +1159,7 @@ Date:   Thu Feb 24 19:26:11 2011 +0100
     for valid tickets once we've set up everything.
 
  src/ka-dialog.c |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
+ 1 file changed, 10 insertions(+)
 
 commit 6c81e8cbf5c9a59f4412fcd96668ec192e7311bd
 Author: Guido Günther <agx@sigxcpu.org>
@@ -850,7 +1170,7 @@ Date:   Thu Feb 24 18:28:51 2011 +0100
     Debian Bug: #582497
 
  src/ka-dialog.c |   10 ++++------
- 1 files changed, 4 insertions(+), 6 deletions(-)
+ 1 file changed, 4 insertions(+), 6 deletions(-)
 
 commit ab3c8a7335af2b9a881eb05c1e71e2679ac46338
 Author: Guido Günther <agx@sigxcpu.org>
@@ -859,7 +1179,7 @@ Date:   Thu Feb 24 13:20:13 2011 +0100
     Add a band aid for #642666
 
  src/ka-applet.c |   34 ++++++++++++++++++++++------------
- 1 files changed, 22 insertions(+), 12 deletions(-)
+ 1 file changed, 22 insertions(+), 12 deletions(-)
 
 commit 0497c19b4ece56ce68837f032f3c87866d9011ba
 Author: Guido Günther <agx@sigxcpu.org>
@@ -880,8 +1200,8 @@ Date:   Sat Feb 19 11:12:34 2011 +0100
 
     Updated Slovenian translation
 
- po/sl.po |  150 ++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 74 insertions(+), 76 deletions(-)
+ po/sl.po |  150 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 74 insertions(+), 76 deletions(-)
 
 commit ba63a6711ab3e0b286ea29ff9a576681c0241a9c
 Author: Daniel Nylander <po@danielnylander.se>
@@ -890,7 +1210,7 @@ Date:   Tue Feb 15 22:16:17 2011 +0100
     Updated Swedish translation
 
  po/sv.po |  416 ++++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 213 insertions(+), 203 deletions(-)
+ 1 file changed, 213 insertions(+), 203 deletions(-)
 
 commit 88acc9ee38f59eaf5800e49cd94c767d5dafdbc8
 Author: Daniel Mustieles <daniel.mustieles@gmail.com>
@@ -898,8 +1218,8 @@ Date:   Tue Feb 15 21:31:36 2011 +0100
 
     Updated Spanish translation
 
- po/es.po |  159 +++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 81 insertions(+), 78 deletions(-)
+ po/es.po |  159 ++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 81 insertions(+), 78 deletions(-)
 
 commit 6ab2def9525e9a8c6d7520bd7ffbaea0b9d5545c
 Author: Guido Günther <agx@sigxcpu.org>
@@ -911,7 +1231,7 @@ Date:   Mon Feb 14 08:35:35 2011 +0100
 
  NEWS         |   23 +++++++++++++++++++++++
  configure.ac |    2 +-
- 2 files changed, 24 insertions(+), 1 deletions(-)
+ 2 files changed, 24 insertions(+), 1 deletion(-)
 
 commit 255bc9697d0e0542c5ea367fb2dbec2e18d3100b
 Author: Guido Günther <agx@sigxcpu.org>
@@ -922,7 +1242,7 @@ Date:   Mon Feb 14 18:54:58 2011 +0100
     for a translatable application name in the notification area
 
  src/ka-applet.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d13c9fdb2723d32b9d2cef3c2b0ab58020050511
 Author: Guido Günther <agx@sigxcpu.org>
@@ -931,7 +1251,7 @@ Date:   Mon Feb 14 09:28:25 2011 +0100
     No need for the tray_icon listener
 
  cc-panel/cc-ka-panel.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2f6eaf384d526ed39c3ae2ae819f45aeb4389cb1
 Author: Guido Günther <agx@sigxcpu.org>
@@ -940,7 +1260,7 @@ Date:   Mon Feb 14 08:32:11 2011 +0100
     Switch build default to GTK+ 3.0
 
  configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit bf3647e817c249fa21ec89dd6698a0dd139565af
 Author: Guido Günther <agx@sigxcpu.org>
@@ -966,7 +1286,7 @@ Date:   Sun Feb 13 20:02:49 2011 +0100
     so the shell can find it to display the correct icon.
 
  src/Makefile.am |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 commit 8adc15960af67e293f5b4cda332ac6d94eb07a98
 Author: Guido Günther <agx@sigxcpu.org>
@@ -975,7 +1295,7 @@ Date:   Sun Feb 13 19:52:22 2011 +0100
     Add Icon to desktop file
 
  src/krb5-auth-dialog.desktop.in |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit a71381d6e26bb93cfe6edad284567b0bf5d68584
 Author: Guido Günther <agx@sigxcpu.org>
@@ -984,7 +1304,7 @@ Date:   Sun Feb 13 19:41:53 2011 +0100
     Open gnome control center panel for preferences
 
  src/ka-applet.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dc5a7e55dc5e6dd7ac17a00c430bc7fa9dd26ae5
 Author: Guido Günther <agx@sigxcpu.org>
@@ -997,8 +1317,8 @@ Date:   Sun Feb 13 17:53:20 2011 +0100
     
     This is a temporary measure until we moved this over into the cc-panel.
 
- src/ka-applet.c |   60 ++++++++++++++++++++++++++++++++++++++++--------------
- 1 files changed, 44 insertions(+), 16 deletions(-)
+ src/ka-applet.c |   60 ++++++++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 44 insertions(+), 16 deletions(-)
 
 commit 5e30a6d5bc6b2b35aefe8f3f98ee2b5ec6b881b4
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1011,10 +1331,10 @@ Date:   Sat Feb 12 16:56:04 2011 +0100
 
  cc-panel/cc-ka-panel.c          |   59 ------------------------
  cc-panel/ka-panel.ui            |   96 ---------------------------------------
- src/ka-applet.c                 |   42 +-----------------
+ src/ka-applet.c                 |   42 +----------------
  src/ka-gconf.c                  |   16 -------
- src/krb5-auth-dialog.schemas.in |   13 -----
- 5 files changed, 1 insertions(+), 225 deletions(-)
+ src/krb5-auth-dialog.schemas.in |   13 ------
+ 5 files changed, 1 insertion(+), 225 deletions(-)
 
 commit b7aaa4b6f869fa2dfd1b78b25ab9448773c46333
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1037,7 +1357,7 @@ Date:   Sat Feb 12 15:40:16 2011 +0100
     It doesn't exist in GTK+ 3
 
  src/krb5-auth-dialog.xml |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 1 file changed, 2 deletions(-)
 
 commit 1b921c629cb7a5a104afb577d3fd6f56d20b5932
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1059,8 +1379,8 @@ Date:   Thu Jan 27 20:50:52 2011 +0100
 
     Updated Slovenian translation
 
- po/sl.po |  175 +++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 89 insertions(+), 86 deletions(-)
+ po/sl.po |  175 ++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 89 insertions(+), 86 deletions(-)
 
 commit 605184d1595ec6c2e6d2cb292850a896de6557ac
 Author: Bruno Brouard <annoa.b@gmail.com>
@@ -1069,7 +1389,7 @@ Date:   Wed Jan 26 22:02:33 2011 +0100
     Updated French translation
 
  po/fr.po |  152 ++++++++++++++++++++++++++++++--------------------------------
- 1 files changed, 74 insertions(+), 78 deletions(-)
+ 1 file changed, 74 insertions(+), 78 deletions(-)
 
 commit f558698ee9ac819a9a7ce9c7fcb76cd48e97f0bf
 Author: Daniel Mustieles <daniel.mustieles@gmail.com>
@@ -1077,8 +1397,8 @@ Date:   Wed Jan 26 20:44:25 2011 +0100
 
     Updated Spanish translation
 
- po/es.po |  159 +++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 81 insertions(+), 78 deletions(-)
+ po/es.po |  159 ++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 81 insertions(+), 78 deletions(-)
 
 commit 65571eaf1adb79151c9a6ecc1bd7caef42d9e3bf
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1095,7 +1415,7 @@ Date:   Tue Jan 25 14:18:52 2011 +0100
  preferences/krb5-auth-dialog-preferences.1.in      |   22 -
  .../krb5-auth-dialog-preferences.desktop.in        |   13 -
  preferences/krb5-auth-dialog-preferences.xml       |  721 -----------------
- 9 files changed, 1 insertions(+), 1663 deletions(-)
+ 9 files changed, 1 insertion(+), 1663 deletions(-)
 
 commit 0d489eac9ce9b7d7d4ef401e88afc5370c16fe39
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1114,7 +1434,7 @@ Date:   Tue Jan 25 14:25:01 2011 +0100
  cc-panel/ka-panel.ui               |  675 +++++++++++++++++++++++++++++
  configure.ac                       |    9 +
  po/POTFILES.in                     |    3 +
- 11 files changed, 1672 insertions(+), 1 deletions(-)
+ 11 files changed, 1672 insertions(+), 1 deletion(-)
 
 commit d8680960e21a5aaa3b32b2b9a56223cc0f742d0c
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1123,7 +1443,7 @@ Date:   Sat Dec 25 23:38:04 2010 +0100
     Only update the expiry time if we succesfully renewed the ticket
 
  src/ka-dialog.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 0e7067cf6ad3f02f17f8246e800f6e596d09f6ec
 Author: Djavan Fagundes <djavan@comum.org>
@@ -1132,7 +1452,7 @@ Date:   Mon Dec 20 11:59:22 2010 -0200
     Added Brazilian Portuguese translation
 
  po/pt_BR.po | 1712 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1712 insertions(+), 0 deletions(-)
+ 1 file changed, 1712 insertions(+)
 
 commit 7a0849edfc20b4c18e5e12945e0781e22a585c90
 Author: Djavan Fagundes <djavan@comum.org>
@@ -1141,7 +1461,7 @@ Date:   Mon Dec 20 11:56:28 2010 -0200
     Added pt_BR to LINGUAS
 
  po/LINGUAS |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 019cdc6b54a5ab420927495676acb694c6055891
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1150,7 +1470,7 @@ Date:   Mon Dec 13 21:11:44 2010 +0100
     Add missing prototype
 
  src/ka-applet-priv.h |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit c6406d4b0441e02f861a1d919529c760305a5c0c
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1159,7 +1479,7 @@ Date:   Mon Dec 13 21:04:07 2010 +0100
     Reindent
 
  src/ka-applet-priv.h |   35 ++++++++++++++++-------------------
- 1 files changed, 16 insertions(+), 19 deletions(-)
+ 1 file changed, 16 insertions(+), 19 deletions(-)
 
 commit 75d4a8c6d7265835702931e5f645198db2e16b7e
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1172,7 +1492,7 @@ Date:   Mon Dec 13 20:53:37 2010 +0100
 
  src/ka-applet.c |   19 ++++++++++++++++++-
  src/ka-dialog.c |    3 +++
- 2 files changed, 21 insertions(+), 1 deletions(-)
+ 2 files changed, 21 insertions(+), 1 deletion(-)
 
 commit 266f97ec422bd743b2d2c56074c0e9f98be278b7
 Author: Andre Klapper <a9016009@gmx.de>
@@ -1181,7 +1501,7 @@ Date:   Tue Nov 9 21:06:08 2010 +0100
     Remove non-existing file to make intltool-update/gettext work
 
  po/POTFILES.in |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 commit 3dabce3c1cd248bfb8799c6a60cb3bda0bf97e06
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1194,7 +1514,7 @@ Date:   Mon Nov 1 17:35:31 2010 +0100
 
  configure.ac    |    9 +++++++++
  src/ka-applet.c |    4 ++++
- 2 files changed, 13 insertions(+), 0 deletions(-)
+ 2 files changed, 13 insertions(+)
 
 commit e81c6d7a0468a116f30ff6e5e3020aa401da2313
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1203,7 +1523,7 @@ Date:   Mon Nov 1 17:41:43 2010 +0100
     Add typenames
 
  CodingStyle |   12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 commit 34b14dc1d2e17051d0626a012d867f878cd7d8b1
 Author: Bruno Brouard <annoa.b@gmail.com>
@@ -1212,7 +1532,7 @@ Date:   Thu Oct 28 21:24:41 2010 +0200
     Updated French translation
 
  po/fr.po |   34 ++++++++++++++++++----------------
- 1 files changed, 18 insertions(+), 16 deletions(-)
+ 1 file changed, 18 insertions(+), 16 deletions(-)
 
 commit a59cc19e4c9a9d65bde7050f2c2d13430f97f922
 Author: Matej Urbančič <mateju@svn.gnome.org>
@@ -1221,7 +1541,7 @@ Date:   Fri Oct 22 14:46:52 2010 +0200
     Added sl for Slovenian translation
 
  help/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a3a493a93bf84ae8c39a325a70f5128c6ec1fa8c
 Author: Matej Urbančič <mateju@svn.gnome.org>
@@ -1230,7 +1550,7 @@ Date:   Fri Oct 22 14:46:38 2010 +0200
     Added Slovenian translation
 
  help/sl/sl.po |  350 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 350 insertions(+), 0 deletions(-)
+ 1 file changed, 350 insertions(+)
 
 commit f89596d6f3fc1061a8732643f59a0bf01284beb9
 Author: Maxim V. Dziumanenko <dziumanenko@gmail.com>
@@ -1238,8 +1558,8 @@ Date:   Wed Oct 13 15:21:55 2010 +0300
 
     Updated Ukrainian translation
 
- po/uk.po |  161 ++++++++++++++++++++++++++++++++++---------------------------
- 1 files changed, 90 insertions(+), 71 deletions(-)
+ po/uk.po |  161 +++++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 90 insertions(+), 71 deletions(-)
 
 commit 93f214594009fef14339c8e97e1b2e2c7d5ca9df
 Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
@@ -1248,7 +1568,7 @@ Date:   Sat Oct 9 19:51:46 2010 +0200
     Updated Slovenian translation
 
  po/sl.po |   57 ++++++++++++++++++++++++++++++---------------------------
- 1 files changed, 30 insertions(+), 27 deletions(-)
+ 1 file changed, 30 insertions(+), 27 deletions(-)
 
 commit 6cb6617fd0c765835b9665739025a63f15eb2a57
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -1257,7 +1577,7 @@ Date:   Thu Oct 7 14:31:28 2010 +0200
     Updated Spanish translation
 
  po/es.po |   38 ++++++++++++++++++++------------------
- 1 files changed, 20 insertions(+), 18 deletions(-)
+ 1 file changed, 20 insertions(+), 18 deletions(-)
 
 commit 58737bd969b6bff566bc8995f41796b15bb62227
 Author: Mario Blättermann <mariobl@gnome.org>
@@ -1266,7 +1586,7 @@ Date:   Wed Oct 6 21:13:44 2010 +0200
     [i18n] Updated German translation
 
  po/de.po |   36 +++++++++++++++++++-----------------
- 1 files changed, 19 insertions(+), 17 deletions(-)
+ 1 file changed, 19 insertions(+), 17 deletions(-)
 
 commit 0da797ca572f411cab3b29bafdf4d4636e5adc32
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1277,7 +1597,7 @@ Date:   Tue Oct 5 17:03:06 2010 +0200
     not needed with GTK+ >= 2.18
 
  src/ka-applet.c |   30 ------------------------------
- 1 files changed, 0 insertions(+), 30 deletions(-)
+ 1 file changed, 30 deletions(-)
 
 commit cda21c8444b0f4e7096a0a5415faef9e19b43ee9
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1312,7 +1632,7 @@ Date:   Tue Oct 5 14:30:09 2010 +0200
     this makes us less dependant on the tray icon.
 
  src/ka-applet.c |   37 ++++++++++++++++++++++++++++++++-----
- 1 files changed, 32 insertions(+), 5 deletions(-)
+ 1 file changed, 32 insertions(+), 5 deletions(-)
 
 commit 19427a839f90f2e30c0184c4ee90d1fe26c7017c
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1321,7 +1641,7 @@ Date:   Tue Oct 5 13:11:57 2010 +0200
     Fix translated strings
 
  src/ka-applet.c |   12 ++++--------
- 1 files changed, 4 insertions(+), 8 deletions(-)
+ 1 file changed, 4 insertions(+), 8 deletions(-)
 
 commit 459ef5f45d99d8b2a27a7618942920dbc29918b6
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1330,7 +1650,7 @@ Date:   Tue Oct 5 12:56:52 2010 +0200
     Add indent expression
 
  CodingStyle |   16 ++++++++++++++--
- 1 files changed, 14 insertions(+), 2 deletions(-)
+ 1 file changed, 14 insertions(+), 2 deletions(-)
 
 commit 6da93e8ccce3ad5a020027854317115d89cb46ab
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1339,7 +1659,7 @@ Date:   Tue Oct 5 12:52:35 2010 +0200
     Reindent
 
  src/ka-applet.c | 1313 +++++++++++++++++++++++++++----------------------------
- 1 files changed, 654 insertions(+), 659 deletions(-)
+ 1 file changed, 654 insertions(+), 659 deletions(-)
 
 commit b780009127e58ced43eb49e6f8f6e00a114c59c3
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1349,7 +1669,7 @@ Date:   Thu Sep 30 10:01:49 2010 +0200
 
  CodingStyle |   13 +++++++++++++
  Makefile.am |    1 +
- 2 files changed, 14 insertions(+), 0 deletions(-)
+ 2 files changed, 14 insertions(+)
 
 commit 1807b5c43f84a2fde21c27353688dbb6cc235e0f
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1360,7 +1680,7 @@ Date:   Thu Sep 30 09:30:23 2010 +0200
     instead of the deprecated libnm_glib_* functions
 
  src/ka-dialog.c |   82 +++++++++++++++++++++++++++----------------------------
- 1 files changed, 40 insertions(+), 42 deletions(-)
+ 1 file changed, 40 insertions(+), 42 deletions(-)
 
 commit 174d4d3582a6b36b94b7b282a805440b76a017e3
 Author: Mario Blättermann <mariobl@gnome.org>
@@ -1368,8 +1688,8 @@ Date:   Wed Sep 22 21:48:14 2010 +0200
 
     [i18n] Updated German doc translation
 
- help/de/de.po |  232 +++++++++++++++++++++++++++++++++++---------------------
- 1 files changed, 145 insertions(+), 87 deletions(-)
+ help/de/de.po |  232 +++++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 145 insertions(+), 87 deletions(-)
 
 commit 7c9386dbac2fee761a09044158c8cdccd742310a
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1387,8 +1707,8 @@ Date:   Thu Aug 19 11:19:24 2010 +0200
 
     Updated French translation
 
- po/fr.po |   71 +++++++++++++++++++++++++++++++++----------------------------
- 1 files changed, 38 insertions(+), 33 deletions(-)
+ po/fr.po |   71 +++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 38 insertions(+), 33 deletions(-)
 
 commit 6451f9f6918349c57286d403efaea64b3c393a65
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1400,7 +1720,7 @@ Date:   Thu Aug 12 17:40:56 2010 +0200
 
  .gitignore |    1 -
  COPYING    |  339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 339 insertions(+), 1 deletions(-)
+ 2 files changed, 339 insertions(+), 1 deletion(-)
 
 commit 52e1e89bda7e75d1489bbc0e2759cca52ec467a9
 Author: Yinghua Wang <wantinghard@gmail.com>
@@ -1410,7 +1730,7 @@ Date:   Wed Aug 11 19:33:28 2010 +0800
 
  po/LINGUAS  |    1 +
  po/zh_CN.po | 1719 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 1720 insertions(+), 0 deletions(-)
+ 2 files changed, 1720 insertions(+)
 
 commit 70dfcaaa9e32180afa13fded9768319766b76b18
 Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
@@ -1419,7 +1739,7 @@ Date:   Thu Aug 5 14:59:39 2010 +0200
     Updated Slovenian translation
 
  po/sl.po |   25 ++++++++++++-------------
- 1 files changed, 12 insertions(+), 13 deletions(-)
+ 1 file changed, 12 insertions(+), 13 deletions(-)
 
 commit cadac4c29c956d59c8253fe0d9906979d0c3f69d
 Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
@@ -1427,8 +1747,8 @@ Date:   Sat Jul 31 18:54:07 2010 +0200
 
     Updated Slovenian translation
 
- po/sl.po |  112 ++++++++++++++-----------------------------------------------
- 1 files changed, 26 insertions(+), 86 deletions(-)
+ po/sl.po |  112 +++++++++++++++-----------------------------------------------
+ 1 file changed, 26 insertions(+), 86 deletions(-)
 
 commit 85f1fa074112da0a48b1c610ce63d4d495000d73
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1438,8 +1758,8 @@ Date:   Thu Jul 29 12:24:44 2010 +0200
     
     to select the GTK+ version used. Code taken from gtk-vnc.
 
- configure.ac |   37 +++++++++++++++++++++++++++++--------
- 1 files changed, 29 insertions(+), 8 deletions(-)
+ configure.ac |   41 +++++++++++++++++++++++++++++++----------
+ 1 file changed, 31 insertions(+), 10 deletions(-)
 
 commit 45f476929622b14a210dd8c6b493506a4f2889a9
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -1447,8 +1767,8 @@ Date:   Wed Jul 28 17:15:43 2010 +0200
 
     Updated Spanish translation
 
- po/es.po |   74 +++++++++++++++++++++++++++++++++----------------------------
- 1 files changed, 40 insertions(+), 34 deletions(-)
+ po/es.po |   74 +++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 40 insertions(+), 34 deletions(-)
 
 commit ecb0378e02aa2a83ea00568e1215d6c804b140f3
 Author: Mario Blättermann <mariobl@gnome.org>
@@ -1457,7 +1777,7 @@ Date:   Tue Jul 27 00:23:46 2010 +0200
     [i18n] Updated German translation
 
  po/de.po |   64 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 32 insertions(+), 32 deletions(-)
+ 1 file changed, 32 insertions(+), 32 deletions(-)
 
 commit 27b83b9fc2608cb9083802255787bac1433e17e7
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1468,7 +1788,7 @@ Date:   Mon Jul 26 13:23:35 2010 +0200
     Thanks: Petter Reinholdtsen
 
  src/ka-applet.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d6a8adf873c988c3e53fdeafc1b50a73bf17e3ec
 Author: Petter Reinholdtsen <pere@hungry.com>
@@ -1476,8 +1796,8 @@ Date:   Sun Jul 25 22:19:03 2010 +0200
 
     Updated Norwegian bokmål translation.
 
- po/nb.po |   96 +++++++++++++++++++++++++++++--------------------------------
- 1 files changed, 46 insertions(+), 50 deletions(-)
+ po/nb.po |   96 ++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 46 insertions(+), 50 deletions(-)
 
 commit 9d7f07ffca8a046ec8f049b6c560febbd83509c2
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1489,8 +1809,8 @@ Date:   Wed Jul 7 17:31:57 2010 +0200
 
  plugins/Makefile.am     |   17 +++++++
  plugins/ka-plugin-afs.c |  114 +++++++++++++++++++++++++++++++++++++++++++++++
- plugins/ka-plugin-afs.h |   50 ++++++++++++++++++++
- 3 files changed, 181 insertions(+), 0 deletions(-)
+ plugins/ka-plugin-afs.h |   50 +++++++++++++++++++++
+ 3 files changed, 181 insertions(+)
 
 commit 6ec57fd83f9b5604dc377d319e847e02c3bb76a0
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1498,9 +1818,9 @@ Date:   Wed Jul 7 17:28:12 2010 +0200
 
     Reindent plugins
 
- plugins/ka-plugin-dummy.c |   67 ++++++++++++++++------------------
+ plugins/ka-plugin-dummy.c |   67 +++++++++++++++++-----------------
  plugins/ka-plugin-dummy.h |   13 ++-----
- plugins/ka-plugin-pam.c   |   88 ++++++++++++++++++++++----------------------
+ plugins/ka-plugin-pam.c   |   88 ++++++++++++++++++++++-----------------------
  plugins/ka-plugin-pam.h   |   15 ++------
  4 files changed, 82 insertions(+), 101 deletions(-)
 
@@ -1511,7 +1831,7 @@ Date:   Wed Jul 7 11:07:44 2010 +0200
     Fail if we can't find krb5-config
 
  configure.ac |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit ddc529abe4b82c9b02731458aade48d67ac7f4d0
 Author: Claude Paroz <claude@2xlibre.net>
@@ -1519,8 +1839,8 @@ Date:   Sun Jul 4 22:02:03 2010 +0200
 
     Updated French translation
 
- po/fr.po |   99 +++++++++++++++++++++++++++++++++----------------------------
- 1 files changed, 54 insertions(+), 45 deletions(-)
+ po/fr.po |   99 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 54 insertions(+), 45 deletions(-)
 
 commit d7946754b453e4facaa03ddf3c6be41333f06244
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1531,7 +1851,7 @@ Date:   Wed Jun 30 21:46:31 2010 +0200
     the later doesn't exist in GTK+3
 
  gtksecentry/gtksecentry.c |   13 ++++++++++++-
- 1 files changed, 12 insertions(+), 1 deletions(-)
+ 1 file changed, 12 insertions(+), 1 deletion(-)
 
 commit a21b7971a3988e2fd6d882eaa794db12dcdc5436
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1540,7 +1860,7 @@ Date:   Wed Jun 30 16:09:21 2010 +0200
     Bump dependencies for GNOME 3.0
 
  configure.ac |   16 +++++++---------
- 1 files changed, 7 insertions(+), 9 deletions(-)
+ 1 file changed, 7 insertions(+), 9 deletions(-)
 
 commit 255e796fbd5704ce8bd9df09a08f33d7ff8417ab
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1550,7 +1870,7 @@ Date:   Tue Jun 29 18:14:52 2010 +0200
 
  NEWS         |   15 +++++++++++++++
  configure.ac |    2 +-
- 2 files changed, 16 insertions(+), 1 deletions(-)
+ 2 files changed, 16 insertions(+), 1 deletion(-)
 
 commit 71809f1d4372da6ba62c2d678063f006746d07cb
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1559,7 +1879,7 @@ 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(-)
+ 1 file changed, 2 insertions(+)
 
 commit 1eadac644636641ff28e0abe9b6701cecee39dbb
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1568,7 +1888,7 @@ 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(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 4743967cb6b3655250b121461812e95934912350
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1579,7 +1899,7 @@ Date:   Fri Jun 18 19:42:46 2010 +0200
     so ka_set_ticket_options can go too.
 
  src/ka-dialog.c |   44 --------------------------------------------
- 1 files changed, 0 insertions(+), 44 deletions(-)
+ 1 file changed, 44 deletions(-)
 
 commit e91acf3273856f07a594403109ddc8edbdad651e
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1590,7 +1910,7 @@ Date:   Fri Jun 18 19:37:41 2010 +0200
     to avoid leaks.
 
  src/ka-dialog.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 26c5f6ebd9f205418a159887fbde6cba66623622
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1599,7 +1919,7 @@ 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(-)
+ 1 file changed, 1 deletion(-)
 
 commit 88a05524474ebbc363167714246c7c3cfde57463
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1608,7 +1928,7 @@ 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(-)
+ 1 file changed, 11 insertions(+), 2 deletions(-)
 
 commit 20f96e0a3c7384feadc29c1ac8b8434743b9fdca
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1617,7 +1937,7 @@ 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(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 379d47bb6deb1771007235408abf2140ca33dd7b
 Author: Petter Reinholdtsen <pere@hungry.com>
@@ -1626,7 +1946,7 @@ Date:   Sun Jun 6 17:59:12 2010 +0200
     Update nb translation
 
  po/nb.po |  995 ++++++++++++++++++++++++++++----------------------------------
- 1 files changed, 450 insertions(+), 545 deletions(-)
+ 1 file changed, 450 insertions(+), 545 deletions(-)
 
 commit 7a7832ce3a7c4adffca663fd5298ac76a47abf27
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1635,7 +1955,7 @@ Date:   Sun Jun 6 17:56:38 2010 +0200
     Explain howto create a pot file
 
  README |   23 +++++++++++++++++------
- 1 files changed, 17 insertions(+), 6 deletions(-)
+ 1 file changed, 17 insertions(+), 6 deletions(-)
 
 commit 5f6d0ea21bc5dab47acd8f478cf866b2dbd084b5
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1646,7 +1966,7 @@ Date:   Sat Jun 5 16:54:30 2010 +0200
     Debian Bug http://bugs.debian.org/569319
 
  configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 61cc98a71b711bad8336a9863ca64a2c6d53875a
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1659,7 +1979,7 @@ Date:   Sat Jun 5 16:21:00 2010 +0200
     making us overlook real erros.
 
  acinclude.m4 |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5da354a13041ade8f969a78b351294337e131d99
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1668,7 +1988,7 @@ Date:   Sat Jun 5 15:25:17 2010 +0200
     Unref file monitor
 
  src/ka-dialog.c |   15 +++++++--------
- 1 files changed, 7 insertions(+), 8 deletions(-)
+ 1 file changed, 7 insertions(+), 8 deletions(-)
 
 commit 6e0435e8b67c845f717f17c7403fb1edf797dfb9
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1702,8 +2022,8 @@ Date:   Sun May 23 02:39:26 2010 +0200
 
     Updated Galician translations
 
- po/gl.po |  159 ++++++++++++++++++++++++++++++++++++++-----------------------
- 1 files changed, 99 insertions(+), 60 deletions(-)
+ po/gl.po |  159 ++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 99 insertions(+), 60 deletions(-)
 
 commit 510d24160ce166a4b3c6dd31d06dc03594bb4a0a
 Author: Christian.Kirbach <Christian.Kirbach@googlemail.com>
@@ -1711,8 +2031,8 @@ Date:   Fri May 21 09:43:17 2010 +0200
 
     Updated German translation
 
- po/de.po |  131 ++++++++++++++++++++++++++++++++-----------------------------
- 1 files changed, 69 insertions(+), 62 deletions(-)
+ po/de.po |  131 +++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 69 insertions(+), 62 deletions(-)
 
 commit 6fe2410819a2c0e2810065a34430e0e9c638cede
 Author: Matthew L. Dailey <matthew.l.dailey@dartmouth.edu>
@@ -1721,7 +2041,7 @@ 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(-)
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 8a5129030c4bb993a41ed685e653f17579849d33
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1737,7 +2057,7 @@ Date:   Sat May 8 15:44:10 2010 +0200
  gtksecentry/Makefile.am        |    7 ++++-
  gtksecentry/gseal-gtk-compat.h |   61 ++++++++++++++++++++++++++++++++++++++++
  gtksecentry/gtksecentry.h      |    1 +
- 3 files changed, 68 insertions(+), 1 deletions(-)
+ 3 files changed, 68 insertions(+), 1 deletion(-)
 
 commit 26633cb549efb6743b115cc95502df6f3475c5cb
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1748,7 +2068,7 @@ Date:   Thu May 6 19:29:29 2010 +0200
     See https://bugs.g10code.com/gnupg/issue1224
 
  gtksecentry/gtksecentry.c |  193 ++++++++++++++++++++++++++-------------------
- 1 files changed, 112 insertions(+), 81 deletions(-)
+ 1 file changed, 112 insertions(+), 81 deletions(-)
 
 commit 80e64ae643ecdcf70e08302ba0b3ef52271cc647
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1757,7 +2077,7 @@ Date:   Sat May 8 14:38:09 2010 +0200
     Make -DSEAL safe
 
  src/ka-pwdialog.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 85cbdef98a2fcb1d2480db9b0783d08c4efbe889
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1769,7 +2089,7 @@ Date:   Wed May 5 17:51:21 2010 +0200
     corner.
 
  src/krb5-auth-dialog.xml |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9a1e5a769be82454c134ca189a274af13b561d79
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1780,7 +2100,7 @@ Date:   Tue May 4 07:30:38 2010 +0200
     and auto enable PAM plugin if found.
 
  configure.ac |   31 +++++++++++++++++++------------
- 1 files changed, 19 insertions(+), 12 deletions(-)
+ 1 file changed, 19 insertions(+), 12 deletions(-)
 
 commit cc597ad513a935902830c1d25e282c202176d6ec
 Author: Mario Blättermann <mariobl@gnome.org>
@@ -1789,7 +2109,7 @@ Date:   Sun May 2 12:13:34 2010 +0200
     Updated German translation
 
  po/de.po |  116 ++++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 60 insertions(+), 56 deletions(-)
+ 1 file changed, 60 insertions(+), 56 deletions(-)
 
 commit c81ecf1285f1bd9c5a2688d071731ccbc5b30cc5
 Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
@@ -1798,7 +2118,7 @@ Date:   Sun May 2 11:43:13 2010 +0200
     Updated Slovenian translation
 
  po/sl.po |  126 +++++++++++++++++++++++++++++++++-----------------------------
- 1 files changed, 67 insertions(+), 59 deletions(-)
+ 1 file changed, 67 insertions(+), 59 deletions(-)
 
 commit 0752fea0ab5ce01f50b2483f0d10ea61b324539b
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1823,7 +2143,7 @@ Date:   Wed Apr 28 20:59:07 2010 +0200
     Update potfile names too
 
  po/POTFILES.in |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 2a2b10c6d55ae13dbc4c0474005673950bf97f45
 Author: Guido Günther <agx@sigxcpu.org>
@@ -1993,8 +2313,8 @@ Date:   Wed Apr 28 08:26:55 2010 +0200
 
     Updated Spanish translation
 
- po/es.po |   81 ++++++++++++++++++++++++++++++++++---------------------------
- 1 files changed, 45 insertions(+), 36 deletions(-)
+ po/es.po |   81 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 45 insertions(+), 36 deletions(-)
 
 commit 2d268123bb3c69bae947cb2a9bae0d54e7af0e32
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2003,7 +2323,7 @@ Date:   Mon Apr 26 22:38:51 2010 +0200
     Document plugin gconf keys
 
  README |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
+ 1 file changed, 10 insertions(+)
 
 commit 3501a11b57a3ea7d43282262ab6768c5a397dba0
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2016,7 +2336,7 @@ Date:   Sun Apr 25 09:43:42 2010 +0200
  src/ka-plugin-loader.c          |   85 +++++++++++++++++++++++++++++----------
  src/krb5-auth-dialog.schemas.in |   13 ++++++
  src/krb5-auth-gconf-tools.h     |    1 +
- src/krb5-auth-gconf.c           |    5 +-
+ src/krb5-auth-gconf.c           |    5 ++-
  4 files changed, 81 insertions(+), 23 deletions(-)
 
 commit 0c5190a9f2161ab25f6081d6e179b4e6317954fa
@@ -2043,11 +2363,11 @@ Date:   Tue Apr 20 22:23:30 2010 +0200
 
  Makefile.am               |    2 +-
  configure.ac              |    1 +
- plugins/.gitignore        |    3 +
+ plugins/.gitignore        |    3 ++
  plugins/Makefile.am       |   23 ++++++++++
  plugins/ka-plugin-dummy.c |  105 +++++++++++++++++++++++++++++++++++++++++++++
  plugins/ka-plugin-dummy.h |   57 ++++++++++++++++++++++++
- 6 files changed, 190 insertions(+), 1 deletions(-)
+ 6 files changed, 190 insertions(+), 1 deletion(-)
 
 commit 69ce38151c7a08fe980d981108c782762bf72e81
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2055,13 +2375,13 @@ Date:   Tue Apr 20 22:21:54 2010 +0200
 
     Add plugin infrastructure
 
- configure.ac           |   10 +++-
- src/Makefile.am        |    7 ++
+ configure.ac           |   10 ++-
+ src/Makefile.am        |    7 +++
  src/ka-plugin-loader.c |  161 ++++++++++++++++++++++++++++++++++++++++++++++++
  src/ka-plugin-loader.h |   58 +++++++++++++++++
  src/ka-plugin.c        |  133 +++++++++++++++++++++++++++++++++++++++
  src/ka-plugin.h        |   75 ++++++++++++++++++++++
- src/krb5-auth-applet.c |   10 +++-
+ src/krb5-auth-applet.c |   10 ++-
  7 files changed, 452 insertions(+), 2 deletions(-)
 
 commit a7f0bdf074c437f98dffd4541d4e6426202e1d69
@@ -2072,7 +2392,7 @@ Date:   Sun Apr 25 09:42:54 2010 +0200
 
  src/krb5-auth-applet.c |    6 ++++++
  src/krb5-auth-applet.h |    2 ++
- 2 files changed, 8 insertions(+), 0 deletions(-)
+ 2 files changed, 8 insertions(+)
 
 commit 14c574f60f33f03b5c92b902479bfd1cd3d95b12
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2082,7 +2402,7 @@ Date:   Sat Apr 24 22:28:29 2010 +0200
 
  src/krb5-auth-gconf-tools.c |   24 ++++++++++++++++++++++++
  src/krb5-auth-gconf-tools.h |    1 +
- 2 files changed, 25 insertions(+), 0 deletions(-)
+ 2 files changed, 25 insertions(+)
 
 commit 07748e8cd58c014c4577806350b3d7c3e61647a8
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2107,7 +2427,7 @@ Date:   Thu Apr 22 08:18:08 2010 +0200
     by reentering his password of by running kinit on the console.
 
  src/krb5-auth-applet.c |   23 ++++++++++++++++-------
- 1 files changed, 16 insertions(+), 7 deletions(-)
+ 1 file changed, 16 insertions(+), 7 deletions(-)
 
 commit d81f5f55376ecc9b8a64c58122ab69a0142105a8
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2117,9 +2437,9 @@ Date:   Wed Apr 21 21:26:55 2010 +0200
 
  src/Makefile.am        |    2 +
  src/ka-closures.c      |  105 ++++++++++++++++++++++++++++++++++++++++++++++++
- src/ka-closures.h      |   38 +++++++++++++++++
+ src/ka-closures.h      |   38 ++++++++++++++++++
  src/krb5-auth-applet.c |    3 +-
- 4 files changed, 147 insertions(+), 1 deletions(-)
+ 4 files changed, 147 insertions(+), 1 deletion(-)
 
 commit 3e82c4e2113c3c9b1246fe56c4e1851c180e6d07
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2138,7 +2458,7 @@ Date:   Sun Apr 18 12:12:05 2010 +0200
     Fix doap file
 
  krb5-auth-dialog.doap |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 909f8e6b51ce70d07a26d9b7d4c8c6ab2ec1d66e
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2147,7 +2467,7 @@ Date:   Sun Apr 11 16:32:04 2010 +0200
     Updated Spanish translation
 
  po/es.po |   64 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 32 insertions(+), 32 deletions(-)
+ 1 file changed, 32 insertions(+), 32 deletions(-)
 
 commit 275ce728387cda5c2c32ed396b22de81586f4713
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2156,7 +2476,7 @@ Date:   Sun Apr 11 16:01:01 2010 +0200
     Updated Spanish translation
 
  po/es.po |   24 ++++++++++++++----------
- 1 files changed, 14 insertions(+), 10 deletions(-)
+ 1 file changed, 14 insertions(+), 10 deletions(-)
 
 commit c69b7aed3f4a7801bdded38d3b3cc5d2ab33baad
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2166,7 +2486,7 @@ Date:   Sat Apr 3 17:32:31 2010 +0200
 
  NEWS         |   12 ++++++++++++
  configure.ac |    2 +-
- 2 files changed, 13 insertions(+), 1 deletions(-)
+ 2 files changed, 13 insertions(+), 1 deletion(-)
 
 commit 16be06e1fd924f3792eb419324ecd816e61c5175
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2175,7 +2495,7 @@ Date:   Sat Apr 3 17:34:59 2010 +0200
     About README
 
  README |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit c374a7f8dbe6ef40c65752e3f35635d50d6b9260
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2185,9 +2505,9 @@ Date:   Fri Apr 2 16:39:37 2010 +0200
 
  Makefile.am             |    2 +-
  configure.ac            |    1 +
- examples/Makefile.am    |    2 +
+ examples/Makefile.am    |    2 ++
  examples/tgt-signals.py |   76 +++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 80 insertions(+), 1 deletions(-)
+ 4 files changed, 80 insertions(+), 1 deletion(-)
 
 commit af7a2fe7f99c59c454624c0ddea2e6e59d33edb5
 Author: Matej Urbančič <mateju@svn.gnome.org>
@@ -2196,7 +2516,7 @@ Date:   Sat Apr 3 10:02:12 2010 +0200
     Updated Slovenian translation
 
  po/sl.po | 1112 +++++++++++++++++++++++++++++++++-----------------------------
- 1 files changed, 586 insertions(+), 526 deletions(-)
+ 1 file changed, 586 insertions(+), 526 deletions(-)
 
 commit 6657dffa9acf9bd9bc360709cc0b5d6a855df05a
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2205,7 +2525,7 @@ Date:   Fri Apr 2 16:13:56 2010 +0200
     Wire up ka_pwdialog_finalize
 
  src/krb5-auth-pwdialog.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
 commit a1212c22e083c0d7c6a957e18c839426def29bbd
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2216,7 +2536,7 @@ Date:   Fri Apr 2 14:28:41 2010 +0200
  .gitignore             |    1 +
  help/.gitignore        |    4 +++-
  preferences/.gitignore |    1 +
- 3 files changed, 5 insertions(+), 1 deletions(-)
+ 3 files changed, 5 insertions(+), 1 deletion(-)
 
 commit f5940e34ffa6e42065a50273c9967f3c6c77fc5e
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2226,10 +2546,10 @@ Date:   Thu Mar 25 21:41:18 2010 +0100
     
     allows external helpers to perform actions like running aklog.
 
- src/krb5-auth-applet-dbus.xml |   12 ++++++++++
- src/krb5-auth-applet.c        |   48 +++++++++++++++++++++++++++++++++++++++-
- src/krb5-auth-applet.h        |   10 ++++++++
- src/krb5-auth-dialog.c        |   32 +++++++++++++++++++++++++-
+ src/krb5-auth-applet-dbus.xml |   12 +++++++++++
+ src/krb5-auth-applet.c        |   48 +++++++++++++++++++++++++++++++++++++++--
+ src/krb5-auth-applet.h        |   10 +++++++++
+ src/krb5-auth-dialog.c        |   32 +++++++++++++++++++++++++--
  src/krb5-auth-dialog.h        |    1 +
  5 files changed, 99 insertions(+), 4 deletions(-)
 
@@ -2239,8 +2559,8 @@ Date:   Fri Apr 2 15:49:45 2010 +0300
 
     Updated Ukrainian translation
 
- po/uk.po |   92 +++++++++++++++++++++++++++++++++++++++++++++++--------------
- 1 files changed, 71 insertions(+), 21 deletions(-)
+ po/uk.po |   92 ++++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 71 insertions(+), 21 deletions(-)
 
 commit ad5b2afd22bdf5e0af02c5de08b046671ce2b2bc
 Author: Petr Kovar <pknbe@volny.cz>
@@ -2250,7 +2570,7 @@ Date:   Sun Mar 21 19:38:35 2010 +0100
 
  po/LINGUAS |    1 +
  po/cs.po   | 1691 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 1692 insertions(+), 0 deletions(-)
+ 2 files changed, 1692 insertions(+)
 
 commit 27f584e90fb965aac0101dac23cd91e2304ee5c7
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2261,7 +2581,7 @@ Date:   Sat Mar 20 17:41:27 2010 +0100
     instead of the deprecated gtk_status_icon_set_tooltip
 
  src/krb5-auth-applet.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 99af82aa7cdd7958314e6ecec22409155529f369
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2272,7 +2592,7 @@ Date:   Sat Mar 20 17:36:02 2010 +0100
     to help screenreaders
 
  src/krb5-auth-applet.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit b95c26ebb9b57b813469ba15e78ba8fe2853de1c
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2281,7 +2601,7 @@ Date:   Sat Feb 20 09:49:45 2010 +0100
     Updated Spanish translation
 
  po/es.po |   27 +++++++++++++--------------
- 1 files changed, 13 insertions(+), 14 deletions(-)
+ 1 file changed, 13 insertions(+), 14 deletions(-)
 
 commit 1be6b136ed491636e91ee0a3a05ae2a63ff33507
 Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
@@ -2290,7 +2610,7 @@ Date:   Thu Feb 18 13:50:16 2010 +0100
     Updated Slovenian translation
 
  po/sl.po |   38 ++++++++++++++++++++------------------
- 1 files changed, 20 insertions(+), 18 deletions(-)
+ 1 file changed, 20 insertions(+), 18 deletions(-)
 
 commit ac8611db0d9be2280e95fd654d57843868df2b39
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2301,7 +2621,7 @@ Date:   Tue Sep 15 17:30:26 2009 +0200
     they're only used with MIT Kerberos.
 
  src/krb5-auth-dialog.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 221ec2732acc5ac58ceaf67101614d8115268e14
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2312,7 +2632,7 @@ Date:   Sun Feb 7 02:32:24 2010 +0100
     if available
 
  configure.ac |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 592dc35e911170e58ba6698925ec664b20ca1abc
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2323,7 +2643,7 @@ Date:   Thu Feb 4 19:02:13 2010 +0100
     since we'd need to monitor the db journal etc. too.
 
  src/krb5-auth-dialog.c |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
+ 1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit 852e24e50d9f68c8458f14f62a38ada86a0084a1
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2332,7 +2652,7 @@ Date:   Mon Jan 4 21:44:36 2010 +0100
     Fix build without libnotify
 
  src/krb5-auth-applet.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0e88520e03c0e45f12a23d2bb6fed1047b6b8bd9
 Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
@@ -2340,8 +2660,8 @@ Date:   Thu Feb 4 19:14:53 2010 +0100
 
     Updated Slovenian translation
 
- po/sl.po |  153 ++++++++++++++++++++++++++-----------------------------------
- 1 files changed, 65 insertions(+), 88 deletions(-)
+ po/sl.po |  153 ++++++++++++++++++++++++++------------------------------------
+ 1 file changed, 65 insertions(+), 88 deletions(-)
 
 commit 5a6c2e68fbfdd873d1a7d0fe3de7352393bf70df
 Author: Matej Urbančič <mateju@svn.gnome.org>
@@ -2350,7 +2670,7 @@ Date:   Sat Jan 23 20:29:14 2010 +0100
     Added sl for Slovenian translation
 
  po/LINGUAS |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 6c4fbabe9bb09a74478e9d41886ec0b7ebf7b631
 Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
@@ -2359,7 +2679,7 @@ Date:   Sat Jan 23 20:29:08 2010 +0100
     Updated Slovenian translation
 
  po/sl.po | 1731 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1731 insertions(+), 0 deletions(-)
+ 1 file changed, 1731 insertions(+)
 
 commit 8e5d97848b68f0972bfc2f4b09cc950ade602173
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2367,8 +2687,8 @@ Date:   Mon Nov 2 12:25:49 2009 +0100
 
     Added Spanish translation
 
- po/es.po |   65 ++++++++++++++++++++++++++++++++++++++++++++-----------------
- 1 files changed, 47 insertions(+), 18 deletions(-)
+ po/es.po |   65 +++++++++++++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 47 insertions(+), 18 deletions(-)
 
 commit 81ece99bdcb17748e3ece5bb48e4902cf1224899
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2378,7 +2698,7 @@ Date:   Sun Nov 1 19:19:45 2009 +0100
 
  NEWS         |   10 ++++++++++
  configure.ac |    2 +-
- 2 files changed, 11 insertions(+), 1 deletions(-)
+ 2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit 4fd24944efbe31f89cbb9384e8dc02f7dcbc82fc
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2389,7 +2709,7 @@ Date:   Wed Oct 28 07:43:42 2009 +0100
     BZ: #599725
 
  help/krb5-auth-dialog.omf.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2620a7e910dfad2efdaf48c2c61587d42c887ac5
 Author: Mario Blättermann <mariobl@gnome.org>
@@ -2398,7 +2718,7 @@ Date:   Mon Oct 19 23:26:42 2009 +0200
     Updated German translation
 
  po/de.po |  848 ++++++++++++++++++++++++++++++++++----------------------------
- 1 files changed, 463 insertions(+), 385 deletions(-)
+ 1 file changed, 463 insertions(+), 385 deletions(-)
 
 commit 4b6bf54f2f34e417619e4785af3fe110494f0bec
 Author: Claude Paroz <claude@2xlibre.net>
@@ -2407,7 +2727,7 @@ Date:   Fri Oct 16 23:53:53 2009 +0200
     Updated French translation
 
  po/fr.po |  807 ++++++++++++++++++++++++++++++--------------------------------
- 1 files changed, 390 insertions(+), 417 deletions(-)
+ 1 file changed, 390 insertions(+), 417 deletions(-)
 
 commit f7da4928083f811897e7cd938ea331d18926f7b2
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2417,8 +2737,8 @@ Date:   Fri Oct 9 19:49:06 2009 +0200
     
     so it can still be closed if another window moves over it.
 
- src/krb5-auth-pwdialog.c |   49 +++++++++++++++++++++++++++++++--------------
- 1 files changed, 34 insertions(+), 15 deletions(-)
+ src/krb5-auth-pwdialog.c |   49 ++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 34 insertions(+), 15 deletions(-)
 
 commit 17f830245d522db0b950de993ff3e3fed5b56846
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2429,7 +2749,7 @@ Date:   Tue Sep 29 14:08:50 2009 +0200
  configure.ac                                  |    1 +
  preferences/Makefile.am                       |    2 ++
  preferences/krb5-auth-dialog-preferences.1.in |   22 ++++++++++++++++++++++
- 3 files changed, 25 insertions(+), 0 deletions(-)
+ 3 files changed, 25 insertions(+)
 
 commit 545556973cfcc5bb033a5f32592e7da958566722
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2440,7 +2760,7 @@ Date:   Tue Sep 29 13:36:19 2009 +0200
     so the dialog is pushed into the foreground when selected from the menu.
 
  src/krb5-auth-tickets.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit beefba604239fbfb9ea4399af1c93139ad5b8bac
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2463,7 +2783,7 @@ Date:   Tue Sep 29 12:34:46 2009 +0200
     the dialog.
 
  src/krb5-auth-dialog.xml |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 64a5d362a0e5a615512e5a2fe3d2b8123c076e93
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2473,7 +2793,7 @@ Date:   Mon Sep 28 18:35:14 2009 +0200
 
  NEWS         |   13 +++++++++++++
  configure.ac |    2 +-
- 2 files changed, 14 insertions(+), 1 deletions(-)
+ 2 files changed, 14 insertions(+), 1 deletion(-)
 
 commit 219b476f87afdabf57ab1ce2b715b3c343534e35
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2482,7 +2802,7 @@ Date:   Mon Sep 28 18:40:30 2009 +0200
     add src/krb5-auth-tickets.c
 
  po/POTFILES.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 126657ebfddb23aa3e3aa18f25f4afae00ecc24d
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2504,7 +2824,7 @@ Date:   Tue Sep 15 18:30:04 2009 +0200
     warn on unsupported cache types
 
  src/krb5-auth-dialog.c |   17 ++++++++++-------
- 1 files changed, 10 insertions(+), 7 deletions(-)
+ 1 file changed, 10 insertions(+), 7 deletions(-)
 
 commit ccaf4225dd658c84bef222cc530cc8d21069cd72
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2513,7 +2833,7 @@ Date:   Sun Sep 20 15:33:24 2009 +0200
     Updated Spanish translation
 
  po/es.po |   62 +++++++++++++++++++++++++++++++++++++++++++-------------------
- 1 files changed, 43 insertions(+), 19 deletions(-)
+ 1 file changed, 43 insertions(+), 19 deletions(-)
 
 commit 78bed43978ec8d943abc0e55e9431a229fdc319e
 Author: Fran Diéguez <fran.dieguez@glug.es>
@@ -2521,8 +2841,8 @@ Date:   Tue Sep 15 23:17:09 2009 +0200
 
     Updated Galician tRanslation
 
- po/gl.po |   74 ++++++++++++++++++++++++++++++++++++++-----------------------
- 1 files changed, 46 insertions(+), 28 deletions(-)
+ po/gl.po |   74 ++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 46 insertions(+), 28 deletions(-)
 
 commit 485b914708dfe900d83fe0082506a2cad2b35b02
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2548,7 +2868,7 @@ Date:   Tue Sep 15 15:02:08 2009 +0200
     BZ: #538225
 
  src/krb5-auth-dialog.c |   44 ++++++++++++++++++++++++++++++--------------
- 1 files changed, 30 insertions(+), 14 deletions(-)
+ 1 file changed, 30 insertions(+), 14 deletions(-)
 
 commit 5f2bb056c67528a3c0172131e8f6b7da12ed7fa6
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2557,7 +2877,7 @@ Date:   Mon Sep 7 19:19:20 2009 +0200
     prefs dialog launch error handling
 
  src/krb5-auth-applet.c |   22 +++++++++++++++++++++-
- 1 files changed, 21 insertions(+), 1 deletions(-)
+ 1 file changed, 21 insertions(+), 1 deletion(-)
 
 commit 3b00f2ad157ca80259c24e5490bea6fee7927eaa
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2566,7 +2886,7 @@ Date:   Mon Sep 7 17:04:44 2009 +0200
     enhance error message for UI xml loading
 
  src/krb5-auth-applet.c |   13 ++++++++++---
- 1 files changed, 10 insertions(+), 3 deletions(-)
+ 1 file changed, 10 insertions(+), 3 deletions(-)
 
 commit 68e5f7a533f46a1fd7e81056595c3d32ca6e4f9f
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2588,9 +2908,9 @@ Date:   Thu Sep 3 19:11:35 2009 +0200
     
     BZ: #593989
 
- .../krb5-auth-dialog-preferences.desktop.in        |    1 +
- src/krb5-auth-dialog.desktop.in                    |    4 +++-
- 2 files changed, 4 insertions(+), 1 deletions(-)
+ preferences/krb5-auth-dialog-preferences.desktop.in |    1 +
+ src/krb5-auth-dialog.desktop.in                     |    4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit d247ce6bb749fdb84bb6826e66d3d416bc47e68e
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2601,7 +2921,7 @@ Date:   Sun Aug 30 19:06:42 2009 +0200
     BZ: #593389
 
  preferences/krb5-auth-dialog-preferences.xml |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
+ 1 file changed, 4 deletions(-)
 
 commit 3c780a0aaa80b1a13684592f0bcda802116ea289
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2610,7 +2930,7 @@ Date:   Sun Aug 30 19:04:41 2009 +0200
     enhance error message for UI xml loading
 
  preferences/krb5-auth-dialog-preferences.c |   12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 commit 0a5ebf8c8a68bffc6eb650e268f584bbdfba148c
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2620,7 +2940,7 @@ Date:   Sun Aug 9 14:11:19 2009 +0200
 
  preferences/Makefile.am                    |    1 +
  preferences/krb5-auth-dialog-preferences.c |    3 +++
- 2 files changed, 4 insertions(+), 0 deletions(-)
+ 2 files changed, 4 insertions(+)
 
 commit 4a84a570a4d3b0d1d91a4091a29b36ac5462125b
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2629,7 +2949,7 @@ Date:   Wed Jul 29 10:29:12 2009 +0200
     clear error on return path
 
  src/krb5-auth-dbus.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 920564fc9c42567e19b8cfa6d5a2cff271b95c6f
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2638,7 +2958,7 @@ Date:   Sun Jul 26 13:36:22 2009 +0200
     check for errors when sending notifications
 
  src/krb5-auth-applet.c |   11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
+ 1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit 438f731923c5c1d9d80f63b640323783eb932148
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2647,7 +2967,7 @@ Date:   Fri Jul 24 12:26:30 2009 +0200
     free nm and g_option context
 
  src/krb5-auth-dialog.c |   24 +++++++++++++++++++++---
- 1 files changed, 21 insertions(+), 3 deletions(-)
+ 1 file changed, 21 insertions(+), 3 deletions(-)
 
 commit 53f36480b82cfd3649bf4488c287112a1d8676f2
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2655,8 +2975,8 @@ Date:   Fri Jul 24 19:36:00 2009 +0200
 
     Updated Spanish translation
 
- po/es.po |   82 ++++++++++++++++++++++++++++++++++---------------------------
- 1 files changed, 46 insertions(+), 36 deletions(-)
+ po/es.po |   82 +++++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 46 insertions(+), 36 deletions(-)
 
 commit 466cd8af9f0fc53556d89680f7892f97f25ca641
 Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
@@ -2667,7 +2987,7 @@ Date:   Thu Jul 23 06:28:44 2009 +0800
  po/LINGUAS  |    2 +
  po/zh_HK.po | 1653 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  po/zh_TW.po | 1653 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 3308 insertions(+), 0 deletions(-)
+ 3 files changed, 3308 insertions(+)
 
 commit d1a21b6d78be240061fcbc6e19e7b41167fe2524
 Author: Daniel Mustieles <daniel.mustieles@gmail.com>
@@ -2676,7 +2996,7 @@ Date:   Tue Jul 21 20:01:52 2009 +0200
     Updated Spanish translation
 
  po/es.po |   19 +++++++++++--------
- 1 files changed, 11 insertions(+), 8 deletions(-)
+ 1 file changed, 11 insertions(+), 8 deletions(-)
 
 commit 944a5442ea99f894325be774b0767856ea31c7ac
 Author: Antón Méixome <meixome@mancomun.org>
@@ -2686,7 +3006,7 @@ Date:   Tue Jul 21 19:09:16 2009 +0200
 
  po/LINGUAS |    1 +
  po/gl.po   | 1745 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 1746 insertions(+), 0 deletions(-)
+ 2 files changed, 1746 insertions(+)
 
 commit 7e3239c48ce4d843f6569ccea1393a5c773e9cde
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2695,7 +3015,7 @@ Date:   Sun Jul 19 21:09:39 2009 +0200
     Updated Spanish translation
 
  po/es.po |   24 +++++++++++++-----------
- 1 files changed, 13 insertions(+), 11 deletions(-)
+ 1 file changed, 13 insertions(+), 11 deletions(-)
 
 commit 290fd41d7848602f233ed90cf4b8862dd29b6158
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2704,7 +3024,7 @@ Date:   Sun Jul 19 13:15:18 2009 +0200
     Updated Spanish translation
 
  po/es.po |   24 ++++++++++++------------
- 1 files changed, 12 insertions(+), 12 deletions(-)
+ 1 file changed, 12 insertions(+), 12 deletions(-)
 
 commit e27cf0a9b7c4cfe1416dddf9357b57812d82569d
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2714,7 +3034,7 @@ Date:   Mon Jul 13 17:57:14 2009 +0200
 
  NEWS         |   13 +++++++++++++
  configure.ac |    2 +-
- 2 files changed, 14 insertions(+), 1 deletions(-)
+ 2 files changed, 14 insertions(+), 1 deletion(-)
 
 commit 9320ca0d8254d5ce931994eadbc0b6c3dbac97a7
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2723,7 +3043,7 @@ Date:   Sun Jul 12 21:59:49 2009 +0200
     Updated Spanish translation
 
  po/es.po |   23 ++++++++++++-----------
- 1 files changed, 12 insertions(+), 11 deletions(-)
+ 1 file changed, 12 insertions(+), 11 deletions(-)
 
 commit ef4f8ae34046a6e81d67c3554ed1ce375bdf7678
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2732,7 +3052,7 @@ Date:   Sun Jul 12 13:00:44 2009 +0200
     Updated Spanish translation
 
  po/es.po |   24 ++++++++++++------------
- 1 files changed, 12 insertions(+), 12 deletions(-)
+ 1 file changed, 12 insertions(+), 12 deletions(-)
 
 commit f5b7c656213a924e241f93fd896e66b25df4184d
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2741,7 +3061,7 @@ Date:   Thu Jul 9 21:19:31 2009 +0200
     Updated Spanish translation
 
  help/es/es.po |   16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
+ 1 file changed, 12 insertions(+), 4 deletions(-)
 
 commit ef074487d5299934241d0b77c4140e6f7c16a823
 Author: Jorge González <jorgegonz@svn.gnome.org>
@@ -2750,7 +3070,7 @@ Date:   Thu Jul 9 21:19:26 2009 +0200
     Updated Spanish translation
 
  po/es.po |   53 ++++++++++++++++++++++++-----------------------------
- 1 files changed, 24 insertions(+), 29 deletions(-)
+ 1 file changed, 24 insertions(+), 29 deletions(-)
 
 commit c8ec676ac95a660a532adc12355ae52ed546e367
 Author: Maxim V. Dziumanenko <dziumanenko@gmail.com>
@@ -2759,7 +3079,7 @@ Date:   Thu Jul 9 11:24:50 2009 +0300
     Updated Ukrainian translation
 
  po/LINGUAS |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit d93881444490f93499f2f7c3404246edc50b5a32
 Author: Maxim V. Dziumanenko <dziumanenko@gmail.com>
@@ -2768,7 +3088,7 @@ Date:   Thu Jul 9 11:22:08 2009 +0300
     Updated Ukrainian translation
 
  po/uk.po | 1669 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1669 insertions(+), 0 deletions(-)
+ 1 file changed, 1669 insertions(+)
 
 commit 0ccbc9f426450aa8840f9166e6c98a48dd4fb54c
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2777,7 +3097,7 @@ Date:   Sun Jul 5 11:30:47 2009 +0200
     Updated Spanish translation
 
  po/es.po |  278 ++++++++++++++++++++++++++++++++++----------------------------
- 1 files changed, 154 insertions(+), 124 deletions(-)
+ 1 file changed, 154 insertions(+), 124 deletions(-)
 
 commit 1a4aba5b7a71dc913d9ba215b023879766a41b91
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2827,7 +3147,7 @@ Date:   Thu Jul 2 13:50:09 2009 +0200
     as propoes by Andre Klapper
 
  src/krb5-auth-applet.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit f772cc0efe41062fa494f9bf5dabb96993a2575e
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2837,8 +3157,8 @@ Date:   Thu Jul 2 13:42:28 2009 +0200
     
     they're never seen by the user
 
- gtksecentry/gtksecentry.c |   51 +++++++++++++++-----------------------------
- 1 files changed, 18 insertions(+), 33 deletions(-)
+ gtksecentry/gtksecentry.c |   51 ++++++++++++++++-----------------------------
+ 1 file changed, 18 insertions(+), 33 deletions(-)
 
 commit ffc48dcc8e4328a531f31c8ae11c3151f184add4
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2850,7 +3170,7 @@ Date:   Thu Jul 2 13:31:00 2009 +0200
     BZ: #587199
 
  help/C/krb5-auth-dialog.xml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d7678acba9c4f60b7b7342ed52a6a41976e44c74
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2861,7 +3181,7 @@ Date:   Mon Jun 22 11:07:15 2009 +0200
     and add filechooser dialog for certificates
 
  configure.ac                                 |   10 +
- preferences/krb5-auth-dialog-preferences.c   |  160 +++++++++++++++-
+ preferences/krb5-auth-dialog-preferences.c   |  160 ++++++++++++++-
  preferences/krb5-auth-dialog-preferences.xml |  271 ++++++++++++++++----------
  3 files changed, 332 insertions(+), 109 deletions(-)
 
@@ -2872,7 +3192,7 @@ Date:   Tue Jun 23 01:57:44 2009 +0200
     add back warning cflags
 
  preferences/Makefile.am |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit d20d7e55ffe1d25c6fa7dc8d2f09ce5e944a26f3
 Author: Guido Günther <agx@sigxcpu.org>
@@ -2881,7 +3201,7 @@ Date:   Sun Jun 28 19:01:14 2009 +0200
     switch to automatic ChangeLog generation
 
  Makefile.am |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
+ 1 file changed, 14 insertions(+)
 
 commit d2f2b4d37d18b83d2aa83741dba3ce27a1678414
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2890,7 +3210,7 @@ Date:   Sun Jun 28 16:27:58 2009 +0200
     Added translated figure
 
  help/es/figures/ka-expired.png |  Bin 11304 -> 11279 bytes
- 1 files changed, 0 insertions(+), 0 deletions(-)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit c899e5ab5f3c64f26b155632ce4f7c19ed92e984
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2899,7 +3219,7 @@ Date:   Sun Jun 28 16:27:49 2009 +0200
     Added translated figure
 
  help/es/figures/ka-valid.png |  Bin 11438 -> 11351 bytes
- 1 files changed, 0 insertions(+), 0 deletions(-)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit 9b419a2e31402f443f0b78970964646ccbc7af27
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2908,7 +3228,7 @@ Date:   Sun Jun 28 16:24:14 2009 +0200
     Added translated figure
 
  help/es/figures/ka-valid.png |  Bin 0 -> 11438 bytes
- 1 files changed, 0 insertions(+), 0 deletions(-)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit f1c92168c9d145c8bb3696861447942fa32549c6
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2917,7 +3237,7 @@ Date:   Sun Jun 28 16:24:07 2009 +0200
     Added translated figure
 
  help/es/figures/ka-expiring.png |  Bin 0 -> 11427 bytes
- 1 files changed, 0 insertions(+), 0 deletions(-)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit d2fc464cbc637db5cf70f98b1c36f6a9938b8a06
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2926,7 +3246,7 @@ Date:   Sun Jun 28 16:23:56 2009 +0200
     Added translated figure
 
  help/es/figures/ka-expired.png |  Bin 0 -> 11304 bytes
- 1 files changed, 0 insertions(+), 0 deletions(-)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit 8c18e885af80ab7c8db2167058696fe843a7fbf4
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2935,7 +3255,7 @@ Date:   Sun Jun 28 16:23:27 2009 +0200
     Updated Spanish translation
 
  po/es.po |  138 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 69 insertions(+), 69 deletions(-)
+ 1 file changed, 69 insertions(+), 69 deletions(-)
 
 commit 9e8e15d419f7b441848b5c57bbf5b3c5138e9ff5
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2943,8 +3263,8 @@ Date:   Sun Jun 28 15:57:59 2009 +0200
 
     Updated Spanish translation
 
- help/es/es.po |   82 ++++++++++++++++++++++++++++++++++++++++++++++++--------
- 1 files changed, 70 insertions(+), 12 deletions(-)
+ help/es/es.po |   82 ++++++++++++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 70 insertions(+), 12 deletions(-)
 
 commit eae48680527a04366aebb397ab9453b0801b92ba
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2952,8 +3272,8 @@ Date:   Sun Jun 21 17:41:09 2009 +0200
 
     Updated Spanish translation
 
- po/es.po |   65 ++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 32 insertions(+), 33 deletions(-)
+ po/es.po |   65 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 32 insertions(+), 33 deletions(-)
 
 commit e24031b764e6067e91b117344ed2a96274ca3f1e
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2962,7 +3282,7 @@ Date:   Sun Jun 21 12:02:19 2009 +0200
     Added initial Spanish translation
 
  help/es/es.po |  514 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 514 insertions(+), 0 deletions(-)
+ 1 file changed, 514 insertions(+)
 
 commit 7b6d6e6bf498be89c87bdc9ef64b0b2310885f73
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -2971,7 +3291,7 @@ Date:   Sun Jun 21 12:01:57 2009 +0200
     Added es to DOC_LINGUAS
 
  help/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5db10b3a3d99ba04292c6608cfd1d175d0c2b426
 Author: Daniel Nylander <po@danielnylander.se>
@@ -2980,7 +3300,7 @@ Date:   Wed Jun 17 08:11:19 2009 +0200
     Added sv to DOC_LINGUAS
 
  help/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8de23cd7cc2a4765b49222b82953bb2d4d5e3f63
 Author: Daniel Nylander <po@danielnylander.se>
@@ -2989,7 +3309,7 @@ Date:   Wed Jun 17 08:10:43 2009 +0200
     Added Swedish manual translation
 
  help/sv/sv.po |  345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 345 insertions(+), 0 deletions(-)
+ 1 file changed, 345 insertions(+)
 
 commit 234fe14a7561561724bb4fb35e9a0d1eb4ea0559
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3000,7 +3320,7 @@ Date:   Sat Jun 13 18:09:22 2009 +0200
  ChangeLog    |    5 +++++
  NEWS         |   17 +++++++++++++++++
  configure.ac |    2 +-
- 3 files changed, 23 insertions(+), 1 deletions(-)
+ 3 files changed, 23 insertions(+), 1 deletion(-)
 
 commit 99603d8759be22bb2098e1999ad19b6e32288eaa
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3009,7 +3329,7 @@ Date:   Sat Jun 13 18:22:42 2009 +0200
     update German translation
 
  po/de.po |  681 ++++++++++++++++++++++++++++++--------------------------------
- 1 files changed, 325 insertions(+), 356 deletions(-)
+ 1 file changed, 325 insertions(+), 356 deletions(-)
 
 commit a0740795f106d12b92240f5ccf940335f1416582
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3018,7 +3338,7 @@ Date:   Mon Jun 15 17:56:40 2009 +0200
     fix build of German translation
 
  help/de/de.po |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9adf604dcea97e9862969863d83d53d3c4bc9ca0
 Author: Mario Blättermann <mariobl@gnome.org>
@@ -3028,7 +3348,7 @@ Date:   Mon Jun 15 11:51:17 2009 +0200
 
  help/Makefile.am |    2 +-
  help/de/de.po    |  519 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 520 insertions(+), 1 deletions(-)
+ 2 files changed, 520 insertions(+), 1 deletion(-)
 
 commit 288e248b5853ce0e3fadd4a362ee16e927f13620
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -3037,7 +3357,7 @@ Date:   Sun Jun 14 12:32:52 2009 +0200
     Updated Spanish translation
 
  po/es.po |  588 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 291 insertions(+), 297 deletions(-)
+ 1 file changed, 291 insertions(+), 297 deletions(-)
 
 commit 56fcbcd45506de6ae3a5a4f34213949d71180300
 Author: Daniel Nylander <po@danielnylander.se>
@@ -3046,7 +3366,7 @@ Date:   Sun Jun 14 11:47:27 2009 +0200
     Updated sv translation (Daniel Nylander)
 
  po/sv.po |  746 +++++++++++++++++++++++++++++---------------------------------
- 1 files changed, 345 insertions(+), 401 deletions(-)
+ 1 file changed, 345 insertions(+), 401 deletions(-)
 
 commit 73c1baacc5ce8129020940a1789466e1579078c7
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3056,7 +3376,7 @@ Date:   Sat Jun 13 18:18:51 2009 +0200
 
  ChangeLog                                    |    4 ++++
  preferences/krb5-auth-dialog-preferences.xml |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 5b7392d972f2e4aa9422af61a9bb0ec25f864925
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3067,7 +3387,7 @@ Date:   Sat Jun 13 17:56:09 2009 +0200
  ChangeLog           |    5 +++++
  etpo/lexer.l        |    6 +++++-
  src/dummy-strings.c |    5 +++++
- 3 files changed, 15 insertions(+), 1 deletions(-)
+ 3 files changed, 15 insertions(+), 1 deletion(-)
 
 commit 4b6d744ac0b6eecd964bcf41d80d2d272d6c0726
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3099,7 +3419,7 @@ Date:   Sat Jun 13 13:27:27 2009 +0200
     Updated Spanish translation
 
  po/es.po |  161 ++++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 83 insertions(+), 78 deletions(-)
+ 1 file changed, 83 insertions(+), 78 deletions(-)
 
 commit e5732ce229922e51866ef2c2c001a1f99a4aaf9c
 Author: Claude Paroz <claude@2xlibre.net>
@@ -3109,7 +3429,7 @@ Date:   Sat Jun 13 12:46:16 2009 +0200
 
  po/LINGUAS |    1 +
  po/fr.po   | 1758 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 1759 insertions(+), 0 deletions(-)
+ 2 files changed, 1759 insertions(+)
 
 commit 6a13af9075e7fc89e5398d747ba9802ccf7eb71d
 Author: Claude Paroz <claude@2xlibre.net>
@@ -3122,7 +3442,7 @@ Date:   Sat Jun 13 12:27:00 2009 +0200
     items.
 
  .../krb5-auth-dialog-preferences.desktop.in        |    2 +-
- preferences/krb5-auth-dialog-preferences.xml       |   54 +++++++++++--------
+ preferences/krb5-auth-dialog-preferences.xml       |   54 +++++++++++---------
  src/krb5-auth-applet.c                             |    1 +
  3 files changed, 33 insertions(+), 24 deletions(-)
 
@@ -3133,7 +3453,7 @@ Date:   Fri Jun 12 22:54:29 2009 +0200
     update German translation
 
  po/de.po |   26 ++++++++++++--------------
- 1 files changed, 12 insertions(+), 14 deletions(-)
+ 1 file changed, 12 insertions(+), 14 deletions(-)
 
 commit 4c53e37b1fbde5e11782d354e6a306bc39da9053
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3142,10 +3462,10 @@ Date:   Fri Jun 12 22:46:19 2009 +0200
     update po
 
  po/de.po                |  137 +++++++++++++++++++++++++++++++++--------------
- po/es.po                |   41 ++++++++-------
+ po/es.po                |   41 +++++++-------
  po/krb5-auth-dialog.pot |  129 ++++++++++++++++++++++++++++++--------------
  po/nb.po                |  135 ++++++++++++++++++++++++++++++++--------------
- po/pa.po                |   43 ++++++++-------
+ po/pa.po                |   43 +++++++--------
  po/sv.po                |  129 ++++++++++++++++++++++++++++++--------------
  6 files changed, 413 insertions(+), 201 deletions(-)
 
@@ -3188,8 +3508,8 @@ Date:   Sun Jun 7 17:36:30 2009 +0200
 
  ChangeLog                                          |   15 +++++++++++
  .../krb5-auth-dialog-preferences.desktop.in        |    2 +-
- preferences/krb5-auth-dialog-preferences.xml       |    4 +-
- src/krb5-auth-applet.c                             |   27 ++++++++++++++-----
+ preferences/krb5-auth-dialog-preferences.xml       |    4 +--
+ src/krb5-auth-applet.c                             |   27 +++++++++++++++-----
  src/krb5-auth-applet.h                             |    2 +-
  src/krb5-auth-dialog.c                             |    7 +----
  src/krb5-auth-dialog.xml                           |    2 +-
@@ -3231,7 +3551,7 @@ Date:   Mon Jun 8 07:01:48 2009 +0530
     updating Translation for Gurmukhi
 
  po/pa.po |  684 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 347 insertions(+), 337 deletions(-)
+ 1 file changed, 347 insertions(+), 337 deletions(-)
 
 commit f359ac03f203f6031a3ad8f620c98bc1047fa43a
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -3240,7 +3560,7 @@ Date:   Sun Jun 7 14:12:33 2009 +0200
     Updated Spanish translation
 
  po/es.po |   24 ++++++++++++------------
- 1 files changed, 12 insertions(+), 12 deletions(-)
+ 1 file changed, 12 insertions(+), 12 deletions(-)
 
 commit 3ae8633c04b6105150c717a8cdb5befe42dada68
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -3249,7 +3569,7 @@ Date:   Thu Jun 4 18:28:53 2009 +0200
     Updated Spanish translation
 
  po/es.po |  262 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 132 insertions(+), 130 deletions(-)
+ 1 file changed, 132 insertions(+), 130 deletions(-)
 
 commit 35709df0b2719af477c7052a033e3188dd3c659c
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3260,7 +3580,7 @@ Date:   Mon Jun 1 21:27:39 2009 +0200
  ChangeLog              |    6 ++++++
  src/Makefile.am        |    1 +
  src/krb5-auth-applet.c |    4 +++-
- 3 files changed, 10 insertions(+), 1 deletions(-)
+ 3 files changed, 10 insertions(+), 1 deletion(-)
 
 commit 141b1a264f5561ab4baa3ce25fb17fa0176e3a1c
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3281,10 +3601,10 @@ Date:   Fri May 29 18:37:39 2009 +0200
  ChangeLog                                    |   17 ++++++++
  po/POTFILES.in                               |    2 +-
  preferences/Makefile.am                      |    2 +
- preferences/krb5-auth-dialog-preferences.c   |   32 +-------------
+ preferences/krb5-auth-dialog-preferences.c   |   32 ++------------
  preferences/krb5-auth-dialog-preferences.xml |    1 +
  src/Makefile.am                              |    2 +
- src/krb5-auth-applet.c                       |   23 +++++++++-
+ src/krb5-auth-applet.c                       |   23 ++++++++--
  src/krb5-auth-tools.c                        |   58 ++++++++++++++++++++++++++
  src/krb5-auth-tools.h                        |   33 +++++++++++++++
  9 files changed, 137 insertions(+), 33 deletions(-)
@@ -3321,7 +3641,7 @@ Date:   Tue May 26 19:10:08 2009 +0200
     Updated Spanish translation
 
  po/es.po |   42 +++++++++++++++++++++++++++---------------
- 1 files changed, 27 insertions(+), 15 deletions(-)
+ 1 file changed, 27 insertions(+), 15 deletions(-)
 
 commit fe515c69334b2686788c04836e76ee63737f3a33
 Author: A S Alam <aalam@users.sf.net>
@@ -3330,7 +3650,7 @@ Date:   Tue May 26 06:21:56 2009 +0530
     Updating Punjabi file with CHARSET varible and add to LINGUAS
 
  po/LINGUAS |    1 +
- po/pa.po   |   91 ++++++++++++++++++++++++++++++++---------------------------
+ po/pa.po   |   91 ++++++++++++++++++++++++++++++++----------------------------
  2 files changed, 50 insertions(+), 42 deletions(-)
 
 commit c7c1ed3d1c730b9bb6202f025d0441f7f4d13c4c
@@ -3352,7 +3672,7 @@ Date:   Mon May 25 18:12:24 2009 +0200
  ChangeLog    |    5 +++++
  NEWS         |   11 +++++++++++
  configure.ac |    2 +-
- 3 files changed, 17 insertions(+), 1 deletions(-)
+ 3 files changed, 17 insertions(+), 1 deletion(-)
 
 commit b1771efe77d21b277377a718015f04897143f5e5
 Author: A S Alam <aalam@users.sf.net>
@@ -3361,7 +3681,7 @@ Date:   Mon May 25 22:08:42 2009 +0530
     Add Punjabi (Gurmukhi) Translation
 
  po/pa.po | 1704 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1704 insertions(+), 0 deletions(-)
+ 1 file changed, 1704 insertions(+)
 
 commit dc0b6e007a86f2e4fdb85e0b45902d8b3f404aed
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -3369,8 +3689,8 @@ Date:   Sun May 24 15:58:44 2009 +0200
 
     Updated Spanish translation
 
- po/es.po |   63 +++++++++++++++++++++++++++++++++----------------------------
- 1 files changed, 34 insertions(+), 29 deletions(-)
+ po/es.po |   63 +++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 34 insertions(+), 29 deletions(-)
 
 commit 6a3456925f6075b1def514d514bbe023030cdbd2
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3380,7 +3700,7 @@ Date:   Fri May 22 15:40:43 2009 +0200
 
  ChangeLog       |    4 ++++
  src/Makefile.am |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit e1e27672e7a5f81320f3abeca1c0ecd2f11e28d0
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -3389,7 +3709,7 @@ Date:   Wed May 20 20:09:17 2009 +0200
     Updated Spanish translation
 
  po/es.po | 1708 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1708 insertions(+), 0 deletions(-)
+ 1 file changed, 1708 insertions(+)
 
 commit 111b4e82aa6546aebf172784be79929f7508102f
 Author: Jorge Gonzalez <jorgegonz@svn.gnome.org>
@@ -3398,7 +3718,7 @@ Date:   Wed May 20 20:08:46 2009 +0200
     Added es to LINGUAS
 
  po/LINGUAS |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit 03e53f40fa38e61988b240aa1d99a570d0cbd2e1
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3406,13 +3726,13 @@ Date:   Tue May 19 19:47:57 2009 +0200
 
     allow notifications to be turned off
 
- ChangeLog                       |   13 ++++++
+ ChangeLog                       |   13 +++++++
  src/krb5-auth-applet.c          |   82 +++++++++++++++++++++++++++++++++------
- src/krb5-auth-dialog.c          |    3 -
- src/krb5-auth-dialog.schemas.in |   39 ++++++++++++++++++
- src/krb5-auth-gconf-tools.c     |   24 +++++++++++
+ src/krb5-auth-dialog.c          |    3 --
+ src/krb5-auth-dialog.schemas.in |   39 +++++++++++++++++++
+ src/krb5-auth-gconf-tools.c     |   24 ++++++++++++
  src/krb5-auth-gconf-tools.h     |    4 ++
- src/krb5-auth-gconf.c           |   26 ++++++------
+ src/krb5-auth-gconf.c           |   26 ++++++-------
  src/krb5-auth-gconf.h           |    3 +-
  8 files changed, 165 insertions(+), 29 deletions(-)
 
@@ -3424,7 +3744,7 @@ Date:   Fri May 15 18:33:07 2009 +0200
 
  ChangeLog               |    7 +
  po/de.po                | 3344 ++++++++++++-----------------------------------
- po/krb5-auth-dialog.pot | 3243 ++++++++++++----------------------------------
+ po/krb5-auth-dialog.pot | 3243 ++++++++++++---------------------------------
  po/nb.po                | 3219 +++++++++++++--------------------------------
  po/sv.po                | 3283 ++++++++++++----------------------------------
  5 files changed, 3450 insertions(+), 9646 deletions(-)
@@ -3450,7 +3770,7 @@ Date:   Fri May 15 17:30:26 2009 +0200
 
  ChangeLog           |    7 +
  etpo/Makefile.am    |   15 ++
- src/dummy-strings.c |  458 ++++----------------------------------------------
+ src/dummy-strings.c |  458 +++++----------------------------------------------
  3 files changed, 59 insertions(+), 421 deletions(-)
 
 commit f58a7c6edec6f163cf6b0fdca2a7ee64445feac7
@@ -3473,7 +3793,7 @@ Date:   Wed May 13 22:10:04 2009 +0200
 
  ChangeLog              |    5 +++++
  src/krb5-auth-dialog.c |    2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
+ 2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 64f39569a0afaf17800ee422808ec968b38adb71
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3483,7 +3803,7 @@ Date:   Wed May 13 20:47:46 2009 +0200
 
  ChangeLog    |    4 ++++
  etpo/lexer.l |    2 ++
- 2 files changed, 6 insertions(+), 0 deletions(-)
+ 2 files changed, 6 insertions(+)
 
 commit f47765829bc612f9be8071f3d5629b73d5430d27
 Author: Christian Persch <chpe@gnome.org>
@@ -3493,12 +3813,12 @@ Date:   Mon May 11 23:51:57 2009 +0200
     
     and use gconftool to install the schema.
 
- ChangeLog                       |   12 +++++++++
- configure.ac                    |    7 +++++
+ ChangeLog                       |   12 ++++++++++
+ configure.ac                    |    7 ++++++
  po/POTFILES.in                  |    1 +
- preferences/Makefile.am         |    2 -
- src/Makefile.am                 |   17 +++++++++----
- src/krb5-auth-dialog.schemas.in |   48 +++++++++++++++++++-------------------
+ preferences/Makefile.am         |    2 --
+ src/Makefile.am                 |   17 ++++++++++----
+ src/krb5-auth-dialog.schemas.in |   48 +++++++++++++++++++--------------------
  6 files changed, 56 insertions(+), 31 deletions(-)
 
 commit e394f9883966af1a76d13e250627056f4f86e941
@@ -3510,9 +3830,9 @@ Date:   Mon May 11 00:45:55 2009 +0200
     BZ: #581901
 
  ChangeLog               |   10 +++++++
- configure.ac            |   13 +-------
- preferences/Makefile.am |   28 ++++++++++++-------
- src/Makefile.am         |   67 +++++++++++++++++++++++++++++++---------------
+ configure.ac            |   13 ++-------
+ preferences/Makefile.am |   28 ++++++++++++--------
+ src/Makefile.am         |   67 +++++++++++++++++++++++++++++++----------------
  4 files changed, 74 insertions(+), 44 deletions(-)
 
 commit be4484021df4bc0d2e1092099bb7023de0dde09f
@@ -3524,7 +3844,7 @@ Date:   Sun May 10 22:19:57 2009 +0200
  ChangeLog              |    6 ++++++
  preferences/.gitignore |    2 ++
  src/.gitignore         |    1 +
- 3 files changed, 9 insertions(+), 0 deletions(-)
+ 3 files changed, 9 insertions(+)
 
 commit e27711ced53e56ff3d5557af5e6fdcfe58bd3a5f
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3536,7 +3856,7 @@ Date:   Sun May 10 22:07:58 2009 +0200
  configure.ac            |    3 +++
  preferences/Makefile.am |    4 ++++
  src/Makefile.am         |    8 +++++++-
- 4 files changed, 21 insertions(+), 1 deletions(-)
+ 4 files changed, 21 insertions(+), 1 deletion(-)
 
 commit 3da2c17fb39462666942b187c2a770907f0bd61a
 Author: Christian Persch <chpe@gnome.org>
@@ -3600,7 +3920,7 @@ Date:   Sun May 3 17:13:40 2009 +0200
  configure.ac           |    4 +++-
  src/Makefile.am        |    1 +
  src/krb5-auth-dialog.c |    1 +
- 4 files changed, 12 insertions(+), 1 deletions(-)
+ 4 files changed, 12 insertions(+), 1 deletion(-)
 
 commit 943847b1cb563adc871a1c153b9824a8b5c0f15b
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3610,7 +3930,7 @@ Date:   Sun May 3 17:07:16 2009 +0200
 
  ChangeLog                                  |    5 +++++
  preferences/krb5-auth-dialog-preferences.c |    4 ++++
- 2 files changed, 9 insertions(+), 0 deletions(-)
+ 2 files changed, 9 insertions(+)
 
 commit 553e864286cc56807280473680afcaa21a660619
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3630,7 +3950,7 @@ Date:   Sun May 3 16:22:55 2009 +0200
 
  .gitignore |    5 +++++
  ChangeLog  |    4 ++++
- 2 files changed, 9 insertions(+), 0 deletions(-)
+ 2 files changed, 9 insertions(+)
 
 commit 8cf197f76d67a92da5b0be67271ce914e75cb2d1
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3653,7 +3973,7 @@ Date:   Sun May 3 16:20:09 2009 +0200
 
  ChangeLog    |    4 ++++
  configure.ac |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit f86a7132ef409bf6c0bdcbc1d5a05ab84d92abc3
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3663,7 +3983,7 @@ Date:   Thu Apr 30 18:07:46 2009 +0200
 
  ChangeLog    |    4 ++++
  configure.ac |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit ababced84c1b23fa8628c2cbe66333e953c8b7cf
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3673,7 +3993,7 @@ Date:   Thu Apr 30 17:57:31 2009 +0200
 
  ChangeLog       |    5 +++++
  src/Makefile.am |    1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
+ 2 files changed, 6 insertions(+)
 
 commit ec60300c9c273d1110f067393bfcc81d305899a9
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3685,7 +4005,7 @@ Date:   Fri Apr 24 10:42:21 2009 +0200
 
  ChangeLog                |    6 ++++++
  src/krb5-auth-pwdialog.c |    6 ++++++
- 2 files changed, 12 insertions(+), 0 deletions(-)
+ 2 files changed, 12 insertions(+)
 
 commit f98c6b79542082e03db771b990b4ffedae8ead80
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3709,7 +4029,7 @@ Date:   Fri Apr 24 09:40:46 2009 +0200
     add Matthias Clasen
 
  AUTHORS |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
 commit 6be2df896a34f1cfd22ea5acdff7a56f012a3717
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3731,7 +4051,7 @@ Date:   Thu Apr 23 18:35:53 2009 +0200
 
  ChangeLog    |    4 ++++
  configure.ac |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 2b18ebf83cdaf568132b3a83db0b28100e1eb2fa
 Merge: e864b1d 6c8adc9
@@ -3748,7 +4068,7 @@ Date:   Sun Mar 15 19:59:42 2009 +0100
 
  ChangeLog |    4 ++++
  NEWS      |   15 +++++++++++++++
- 2 files changed, 19 insertions(+), 0 deletions(-)
+ 2 files changed, 19 insertions(+)
 
 commit 082929a0feab7c2e05a7a72411d015c06bf2be7a
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3783,7 +4103,7 @@ Date:   Sun Mar 15 19:59:42 2009 +0100
     Update NEWS
 
  NEWS |   15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
+ 1 file changed, 15 insertions(+)
 
 commit bd9906921b319351916ced169e57574359b2c36d
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3795,7 +4115,7 @@ Date:   Thu Apr 9 12:55:16 2009 +0200
     current principal name from gconf.
 
  src/krb5-auth-dialog.c |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit bd85050180403b362e529dda521915eeebca9320
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3817,7 +4137,7 @@ Date:   Sat Apr 18 00:15:37 2009 +0200
 
  ChangeLog             |    5 +++++
  src/krb5-auth-gconf.c |    5 ++++-
- 2 files changed, 9 insertions(+), 1 deletions(-)
+ 2 files changed, 9 insertions(+), 1 deletion(-)
 
 commit 8565f2fff3364540c0412c425be5f594123cb84d
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3826,7 +4146,7 @@ Date:   Fri Apr 17 13:54:33 2009 +0200
     add doap file
 
  krb5-auth-dialog.doap |   17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
+ 1 file changed, 17 insertions(+)
 
 commit 7bdc111f7d53597ec91bf118a2f0ee51217e7312
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3838,7 +4158,7 @@ Date:   Tue Apr 14 19:03:50 2009 +0200
 
  ChangeLog                                      |    5 +++++
  preferences/krb5-auth-dialog-preferences.glade |    8 +++++++-
- 2 files changed, 12 insertions(+), 1 deletions(-)
+ 2 files changed, 12 insertions(+), 1 deletion(-)
 
 commit 94e4fb1e162eedb1093eb8791047b67bbb3d20e6
 Author: Guido Günther <agx@sigxcpu.org>
@@ -3850,11 +4170,11 @@ Date:   Mon Apr 13 18:30:55 2009 +0200
     available.
 
  ChangeLog                                      |   27 +++++++++
- configure.ac                                   |   27 ++++-----
+ configure.ac                                   |   27 +++++----
  preferences/krb5-auth-dialog-preferences.c     |   74 +++++++++++++++++++++++-
  preferences/krb5-auth-dialog-preferences.glade |   43 +++++++++++++-
  src/krb5-auth-applet.c                         |   22 +++++++
- src/krb5-auth-dialog.c                         |   67 +++++++++++++++-------
+ src/krb5-auth-dialog.c                         |   67 ++++++++++++++-------
  src/krb5-auth-dialog.schemas.in                |   17 +++++-
  src/krb5-auth-gconf-tools.h                    |    1 +
  src/krb5-auth-gconf.c                          |   17 ++++++
@@ -3912,9 +4232,9 @@ Date:   Sat Apr 4 09:29:48 2009 +0000
     
     svn path=/trunk/; revision=139
 
- ChangeLog                       |   15 ++++++++
- src/krb5-auth-applet.c          |   68 ++++++++++++++++++++++++++++++++++++--
- src/krb5-auth-dialog.c          |   49 +++++++++++++++++++++------
+ ChangeLog                       |   15 +++++++++
+ src/krb5-auth-applet.c          |   68 ++++++++++++++++++++++++++++++++++++---
+ src/krb5-auth-dialog.c          |   49 +++++++++++++++++++++-------
  src/krb5-auth-dialog.schemas.in |   39 ++++++++++++++++++++++
  src/krb5-auth-gconf-tools.h     |    3 ++
  src/krb5-auth-gconf.c           |   48 +++++++++++++++++++++++++++
@@ -3932,7 +4252,7 @@ Date:   Sat Apr 4 09:29:44 2009 +0000
  src/Makefile.am             |    2 +
  src/krb5-auth-gconf-tools.c |  102 +++++++++++++++++++++++++++++++++++++++++++
  src/krb5-auth-gconf-tools.h |   38 ++++++++++++++++
- src/krb5-auth-gconf.c       |   87 +------------------------------------
+ src/krb5-auth-gconf.c       |   87 +-----------------------------------
  5 files changed, 152 insertions(+), 86 deletions(-)
 
 commit 5f1cbfe8202fb9e5e86ae7dcb02a5e01a29438de
@@ -3961,7 +4281,7 @@ Date:   Fri Mar 27 07:06:49 2009 +0000
 
  ChangeLog              |    8 +++++
  configure.ac           |    3 ++
- src/krb5-auth-dialog.c |   76 ++++++++++++++++++++++++++++++++++++++++++++++-
+ src/krb5-auth-dialog.c |   76 ++++++++++++++++++++++++++++++++++++++++++++++--
  3 files changed, 85 insertions(+), 2 deletions(-)
 
 commit 1fd2cc3fe16f0ea52844b4f4294ba708a8a43f41
@@ -3997,7 +4317,7 @@ Date:   Fri Mar 27 07:06:43 2009 +0000
     
     svn path=/trunk/; revision=134
 
- ChangeLog              |    7 +++++
+ ChangeLog              |    7 ++++++
  src/krb5-auth-dialog.c |   58 +++++++++++++++++++++++++++++-------------------
  2 files changed, 42 insertions(+), 23 deletions(-)
 
@@ -4023,12 +4343,12 @@ Date:   Wed Mar 11 16:25:58 2009 +0000
     
     svn path=/trunk/; revision=132
 
- ChangeLog                |    7 ++++++
- src/krb5-auth-applet.c   |   48 ++++++++++++++++++++++++++-------------------
- src/krb5-auth-dialog.c   |   36 ++++++++++++++++++++--------------
+ ChangeLog                |    7 +++++++
+ src/krb5-auth-applet.c   |   48 +++++++++++++++++++++++++++-------------------
+ src/krb5-auth-dialog.c   |   36 +++++++++++++++++++---------------
  src/krb5-auth-dialog.h   |    2 +-
- src/krb5-auth-gconf.c    |    6 +++-
- src/krb5-auth-pwdialog.c |    6 +++-
+ src/krb5-auth-gconf.c    |    6 ++++--
+ src/krb5-auth-pwdialog.c |    6 ++++--
  src/krb5-auth-pwdialog.h |    2 +-
  7 files changed, 66 insertions(+), 41 deletions(-)
 
@@ -4043,7 +4363,7 @@ Date:   Wed Mar 11 16:25:55 2009 +0000
  ChangeLog            |    7 ++++
  acinclude.m4         |   88 ++++++++++++++++++++++++++++++++++++++++++++++++++
  configure.ac         |   12 +++++--
- m4/compiler-flags.m4 |   40 ++++++++++++++++++++++
+ m4/compiler-flags.m4 |   40 +++++++++++++++++++++++
  4 files changed, 144 insertions(+), 3 deletions(-)
 
 commit 7bc813583189b77a7f3f3f42f808a29f9012874f
@@ -4054,9 +4374,9 @@ Date:   Wed Mar 11 16:25:52 2009 +0000
     
     svn path=/trunk/; revision=130
 
- ChangeLog                |   11 ++++++++
+ ChangeLog                |   11 +++++++++
  src/krb5-auth-pwdialog.c |   58 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 69 insertions(+), 0 deletions(-)
+ 2 files changed, 69 insertions(+)
 
 commit d462f9c64b79e17e4d10f3f99c4ad93ec72623b6
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4069,14 +4389,14 @@ Date:   Wed Mar 11 16:25:47 2009 +0000
  ChangeLog                  |   12 +++
  po/POTFILES.in             |    1 +
  src/Makefile.am            |    2 +
- src/krb5-auth-applet.c     |   69 +++-----------
+ src/krb5-auth-applet.c     |   69 +++----------
  src/krb5-auth-applet.h     |   16 +--
  src/krb5-auth-dbus.c       |    1 +
  src/krb5-auth-dialog.c     |  236 +++++++++++++-------------------------------
  src/krb5-auth-dialog.glade |    2 +-
  src/krb5-auth-dialog.h     |    1 +
  src/krb5-auth-pwdialog.c   |  186 ++++++++++++++++++++++++++++++++++
- src/krb5-auth-pwdialog.h   |   66 ++++++++++++
+ src/krb5-auth-pwdialog.h   |   66 +++++++++++++
  11 files changed, 357 insertions(+), 235 deletions(-)
 
 commit 195473836e04982a55efdbc948461be5914d1797
@@ -4107,9 +4427,9 @@ Date:   Sat Feb 28 17:47:48 2009 +0000
     
     svn path=/trunk/; revision=127
 
- ChangeLog              |    6 ++++
- src/krb5-auth-dialog.c |   60 ++++++++++++++++++++++++++++++++++++++++++++++-
- src/krb5-auth-dialog.h |    4 +-
+ ChangeLog              |    6 +++++
+ src/krb5-auth-dialog.c |   60 ++++++++++++++++++++++++++++++++++++++++++++++--
+ src/krb5-auth-dialog.h |    4 ++--
  3 files changed, 66 insertions(+), 4 deletions(-)
 
 commit aa6ada2845198866ea4b96de93c96e30dcfbbe91
@@ -4148,7 +4468,7 @@ Date:   Sat Feb 28 13:27:07 2009 +0000
  etpo/.gitignore |    4 ++++
  po/.gitignore   |    5 +++++
  src/.gitignore  |    5 +++++
- 5 files changed, 49 insertions(+), 0 deletions(-)
+ 5 files changed, 49 insertions(+)
 
 commit 0a2135919b9ab1edb3669449298e72fc8289da7f
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4173,7 +4493,7 @@ Date:   Thu Jan 15 18:53:37 2009 +0000
 
  ChangeLog |    4 ++++
  NEWS      |   11 +++++++++++
- 2 files changed, 15 insertions(+), 0 deletions(-)
+ 2 files changed, 15 insertions(+)
 
 commit e67ebf8d9a280042344c016dbd875b900a184439
 Author: Daniel Nylander <dnylande@src.gnome.org>
@@ -4185,7 +4505,7 @@ Date:   Thu Jan 15 16:21:23 2009 +0000
 
  po/ChangeLog |    4 +
  po/sv.po     | 3298 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 3302 insertions(+), 0 deletions(-)
+ 2 files changed, 3302 insertions(+)
 
 commit afbffb722e4cd571ec4f253c60becc4fd5852ced
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4216,7 +4536,7 @@ Date:   Sun Jan 11 22:00:29 2009 +0000
  AUTHORS     |    1 +
  ChangeLog   |    4 ++++
  MAINTAINERS |    4 ++++
- 3 files changed, 9 insertions(+), 0 deletions(-)
+ 3 files changed, 9 insertions(+)
 
 commit 37027fb48731ecc4b42b84934489436e5a2e9fc1
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4228,7 +4548,7 @@ Date:   Sat Jan 10 15:31:21 2009 +0000
 
  ChangeLog    |    4 ++++
  configure.ac |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 9ff692e4b861a08b3a1a07583fafba4897d89517
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4242,7 +4562,7 @@ Date:   Sat Jan 10 13:25:53 2009 +0000
  configure.ac |    2 +-
  po/ChangeLog |    4 +
  po/de.po     | 3293 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 3302 insertions(+), 1 deletions(-)
+ 4 files changed, 3302 insertions(+), 1 deletion(-)
 
 commit 4826ef590c1c7cc8e147f651b32b8ce6d25e6bc6
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4279,7 +4599,7 @@ Date:   Sat Jan 10 13:25:48 2009 +0000
  ChangeLog        |    6 ++++++
  po/POTFILES.in   |    4 ++++
  po/POTFILES.skip |    1 +
- 3 files changed, 11 insertions(+), 0 deletions(-)
+ 3 files changed, 11 insertions(+)
 
 commit 904f7112dabeac824a5a4eb45fb1c234d8846070
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4291,7 +4611,7 @@ Date:   Sat Jan 10 13:25:46 2009 +0000
 
  ChangeLog       |    4 ++++
  src/Makefile.am |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit edd0791c4fe9468372001a2ba44f87c156bdad71
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4301,10 +4621,10 @@ Date:   Sat Jan 10 13:25:44 2009 +0000
     
     svn path=/trunk/; revision=111
 
- ChangeLog                       |    6 ++++
- src/Makefile.am                 |    9 ++++++
+ ChangeLog                       |    6 +++++
+ src/Makefile.am                 |    9 +++++++
  src/krb5-auth-dialog.schemas.in |   55 +++++++++++++++++++++++++++++++++++++++
- 3 files changed, 70 insertions(+), 0 deletions(-)
+ 3 files changed, 70 insertions(+)
 
 commit 16b6522497bc4a5af8b28bb011db15b3fb879996
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4316,10 +4636,10 @@ Date:   Sat Jan 10 13:25:42 2009 +0000
     
     svn path=/trunk/; revision=110
 
- ChangeLog              |   12 +++++++
+ ChangeLog              |   12 ++++++++
  src/krb5-auth-applet.c |   80 +++++++++++++++++++++++++++++++-----------------
- src/krb5-auth-notify.c |   19 ++++++++---
- src/krb5-auth-notify.h |    4 --
+ src/krb5-auth-notify.c |   19 +++++++++---
+ src/krb5-auth-notify.h |    4 ---
  4 files changed, 78 insertions(+), 37 deletions(-)
 
 commit ab0c59f1d7c1cbac49ce7648d57a78fbab5856da
@@ -4350,7 +4670,7 @@ Date:   Sat Jan 10 13:25:38 2009 +0000
 
  ChangeLog              |    5 +++++
  src/krb5-auth-applet.c |    3 ++-
- 2 files changed, 7 insertions(+), 1 deletions(-)
+ 2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit af41f6f028d4323b077becb96eb6af1e06b078c9
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4364,7 +4684,7 @@ Date:   Sat Jan 10 13:25:36 2009 +0000
  README                 |    4 +
  configure.ac           |   21 ++++
  src/krb5-auth-applet.h |    3 +-
- src/krb5-auth-dialog.c |  300 ++++++++++++++++++++++++++++++-----------------
+ src/krb5-auth-dialog.c |  300 ++++++++++++++++++++++++++++++------------------
  src/krb5-auth-gconf.c  |   16 +++
  6 files changed, 249 insertions(+), 110 deletions(-)
 
@@ -4391,9 +4711,9 @@ Date:   Sat Jan 10 13:25:32 2009 +0000
     
     svn path=/trunk/; revision=105
 
- ChangeLog              |    5 ++
+ ChangeLog              |    5 +++
  src/krb5-auth-applet.h |    1 +
- src/krb5-auth-dialog.c |  111 ++++++++++++++++++++++++++++++++---------------
+ src/krb5-auth-dialog.c |  111 ++++++++++++++++++++++++++++++++----------------
  3 files changed, 81 insertions(+), 36 deletions(-)
 
 commit df61913ad3ae0842da2a5b36cb7d0bad0658712c
@@ -4426,9 +4746,9 @@ Date:   Sat Jan 10 13:25:28 2009 +0000
     
     svn path=/trunk/; revision=103
 
- ChangeLog                  |   12 +++++++++++
- src/Makefile.am            |    2 +
- src/krb5-auth-dialog.c     |   45 ++++++++++++++++++++++++++++++++++++++++---
+ ChangeLog                  |   12 ++++++++++++
+ src/Makefile.am            |    2 ++
+ src/krb5-auth-dialog.c     |   45 ++++++++++++++++++++++++++++++++++++++++----
  src/krb5-auth-dialog.glade |    2 +-
  4 files changed, 56 insertions(+), 5 deletions(-)
 
@@ -4440,8 +4760,8 @@ Date:   Sat Jan 10 13:25:26 2009 +0000
     
     svn path=/trunk/; revision=102
 
- ChangeLog              |    7 ++++
- src/Makefile.am        |    2 +
+ ChangeLog              |    7 +++++
+ src/Makefile.am        |    2 ++
  src/krb5-auth-dbus.c   |   78 ++++++++++++++++++++++++++++++++++++++++++++++++
  src/krb5-auth-dbus.h   |   28 +++++++++++++++++
  src/krb5-auth-dialog.c |   49 ++++--------------------------
@@ -4472,7 +4792,7 @@ Date:   Sat Jan 10 13:25:23 2009 +0000
  secmem/util.c             |  139 ++
  secmem/util.h             |   66 +
  src/Makefile.am           |    2 +
- 15 files changed, 4488 insertions(+), 1 deletions(-)
+ 15 files changed, 4488 insertions(+), 1 deletion(-)
 
 commit 61c36c96f0dcd42a44684447a66ccc153ce2fbd5
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4485,20 +4805,20 @@ Date:   Sat Jan 10 13:25:20 2009 +0000
  ChangeLog                     |   12 ++
  Makefile.am                   |    2 +-
  README                        |   14 ++-
- configure.ac                  |   94 ++++++++++++++--
+ configure.ac                  |   94 +++++++++++++--
  etpo/Makefile.am              |   20 +++-
  icons/Makefile.am             |   10 ++
  icons/krb-no-valid-ticket.png |  Bin 0 -> 1234 bytes
  icons/krb-valid-ticket.png    |  Bin 0 -> 1126 bytes
- src/Makefile.am               |   16 +++-
+ src/Makefile.am               |   16 ++-
  src/krb5-auth-applet.c        |  238 ++++++++++++++++++++++++++++++++++++++
  src/krb5-auth-applet.h        |   68 +++++++++++
  src/krb5-auth-dialog.c        |  252 ++++++++++++++++++++++++++++-------------
  src/krb5-auth-dialog.h        |   30 +++++
  src/krb5-auth-gconf.c         |  206 +++++++++++++++++++++++++++++++++
  src/krb5-auth-gconf.h         |   28 +++++
- src/krb5-auth-notify.c        |   57 +++++++++
- src/krb5-auth-notify.h        |   32 +++++
+ src/krb5-auth-notify.c        |   57 ++++++++++
+ src/krb5-auth-notify.h        |   32 ++++++
  17 files changed, 988 insertions(+), 91 deletions(-)
 
 commit 37663e53c00fe229b721c48ce6739195b97f4b51
@@ -4514,7 +4834,7 @@ Date:   Fri Sep 26 15:16:18 2008 +0000
 
  ChangeLog                  |    6 ++++++
  src/krb5-auth-dialog.glade |    1 -
- 2 files changed, 6 insertions(+), 1 deletions(-)
+ 2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit d466f8d0dad90d7ba3eadd2f92bffceb16a4f16e
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4528,7 +4848,7 @@ Date:   Fri Sep 26 15:12:13 2008 +0000
 
  ChangeLog                 |    4 ++++
  src/krb5-auth-dialog.1.in |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 0e9dd13bc21f68001c101183e7d03afe2f7966cb
 Author: Guido Günther <guidog@src.gnome.org>
@@ -4605,7 +4925,7 @@ Date:   Mon Jun 9 19:49:21 2008 +0000
 
  ChangeLog              |    8 ++++++++
  src/krb5-auth-dialog.c |    1 +
- 2 files changed, 9 insertions(+), 0 deletions(-)
+ 2 files changed, 9 insertions(+)
 
 commit edb2b61359fcf3ee836feec5ec4dae5a97a040da
 Author: Colin Walters <walters@verbum.org>
@@ -4625,7 +4945,7 @@ Date:   Mon Jun 9 19:08:47 2008 +0000
 
  ChangeLog    |    7 +++++++
  configure.ac |    2 +-
- 2 files changed, 8 insertions(+), 1 deletions(-)
+ 2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 32089598db7ba5b752df80b141f26c1d6119e05d
 Author: Colin Walters <walters@verbum.org>
@@ -4684,7 +5004,7 @@ Date:   Mon Jun 9 18:00:13 2008 +0000
 
  ChangeLog              |    8 ++++++++
  src/krb5-auth-dialog.c |    1 +
- 2 files changed, 9 insertions(+), 0 deletions(-)
+ 2 files changed, 9 insertions(+)
 
 commit e69859d9d731aec14a55c443ea5e9a81cdd4589c
 Author: Colin Walters <walters@verbum.org>
@@ -4721,7 +5041,7 @@ Date:   Sat Mar 22 04:26:58 2008 +0000
 
  ChangeLog              |    6 ++++++
  src/krb5-auth-dialog.c |    6 ++++++
- 2 files changed, 12 insertions(+), 0 deletions(-)
+ 2 files changed, 12 insertions(+)
 
 commit 2982c8d12ec3a47575adcc09e2b7eb3cc00fdcbc
 Author: Colin Walters <walters@src.gnome.org>
@@ -4732,7 +5052,7 @@ Date:   Sat Mar 22 04:26:46 2008 +0000
     svn path=/trunk/; revision=69
 
  MAINTAINERS |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ 1 file changed, 7 insertions(+)
 
 commit a33ff6eb801355abeb4a37fc109c85a3d11d9a05
 Author: Kjartan Maraas,,23491770 <kmaraas@gnome.org>
@@ -4780,7 +5100,7 @@ Date:   Sun Oct 29 17:42:34 2006 +0000
     	make things slightly more readable.
 
  ChangeLog              |    5 +++
- src/krb5-auth-dialog.c |   81 ++++++++++++++++-------------------------------
+ src/krb5-auth-dialog.c |   81 +++++++++++++++++-------------------------------
  2 files changed, 33 insertions(+), 53 deletions(-)
 
 commit b684283623c69ae8c1a69536628b79c531ff6bdd
@@ -4795,7 +5115,7 @@ Date:   Mon Jul 24 17:59:24 2006 +0000
 
  ChangeLog    |    4 ++++
  configure.ac |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 85eaba78ed017ec6765827f3d5b6b4afcc63af78
 Author: Christopher Aillon <caillon@redhat.com>
@@ -4814,7 +5134,7 @@ Date:   Mon Jul 24 17:48:24 2006 +0000
 
  ChangeLog              |    9 +++++++++
  src/krb5-auth-dialog.c |    7 ++++++-
- 2 files changed, 15 insertions(+), 1 deletions(-)
+ 2 files changed, 15 insertions(+), 1 deletion(-)
 
 commit 8e183b3018d90e2b5d984afcc69e98520eac966f
 Author: Kjartan Maraas <kmaraas@gnome.org>
@@ -4846,8 +5166,8 @@ Date:   Sat Mar 18 00:21:08 2006 +0000
     
     	* configure.ac: Add test to see whether we have krb5_get_renewed_creds
 
- ChangeLog              |    8 ++
- configure.ac           |    4 +
+ ChangeLog              |    8 +++
+ configure.ac           |    4 ++
  src/krb5-auth-dialog.c |  177 +++++++++++++++++++++++++++---------------------
  3 files changed, 111 insertions(+), 78 deletions(-)
 
@@ -4892,7 +5212,7 @@ Date:   Wed Feb 1 18:05:34 2006 +0000
 
  ChangeLog |    5 +++++
  README    |    2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
+ 2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 6de9f716fceb6bced274f219770cf05cbb7d6b66
 Author: Nalin Dahyabhai <nalin@src.gnome.org>
@@ -4904,7 +5224,7 @@ Date:   Wed Feb 1 18:05:14 2006 +0000
     	were passing an int where a pointer was expected
 
  src/krb5-auth-dialog.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 6cfda2bb58907f2ae1a11bf3e8a9fad00d170d6c
 Author: Christopher Aillon <caillon@redhat.com>
@@ -4918,7 +5238,7 @@ Date:   Tue Jan 31 06:49:30 2006 +0000
 
  ChangeLog    |    4 ++++
  configure.ac |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit ba5d724a795775f3c2cd2e3d7b7890142ff2e7fc
 Author: Christopher Aillon <caillon@src.gnome.org>
@@ -4927,7 +5247,7 @@ Date:   Tue Jan 31 06:48:30 2006 +0000
     update the name and comment
 
  src/krb5-auth-dialog.desktop.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c5b37d1494adeaf9971dc0d91ef204b591486052
 Author: Christopher Aillon <caillon@redhat.com>
@@ -4951,7 +5271,7 @@ Date:   Tue Jan 31 05:41:57 2006 +0000
  src/.cvsignore                  |    1 +
  src/Makefile.am                 |    7 +++++++
  src/krb5-auth-dialog.desktop.in |    9 +++++++++
- 5 files changed, 29 insertions(+), 0 deletions(-)
+ 5 files changed, 29 insertions(+)
 
 commit 4a0ed93fc1a447cad2df858ffa6fb14d371708e4
 Author: Christopher Aillon <caillon@src.gnome.org>
@@ -4960,7 +5280,7 @@ Date:   Tue Jan 31 05:37:16 2006 +0000
     fix whitespace
 
  Makefile.am |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit dc8f27b4f10d1814882cf2a30655357c16bd681a
 Author: Christopher Aillon <caillon@redhat.com>
@@ -4975,7 +5295,7 @@ Date:   Tue Jan 31 05:19:15 2006 +0000
 
  ChangeLog                  |    5 +++++
  src/krb5-auth-dialog.glade |    1 -
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 1074281745f36ee47f9a032ac8078567d0e44434
 Author: Christopher Aillon <caillon@redhat.com>
@@ -4989,7 +5309,7 @@ Date:   Tue Nov 8 19:45:41 2005 +0000
 
  ChangeLog    |    4 ++++
  configure.ac |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 3e7c694ddce113e6b40c125ac4ab64ad82e30deb
 Author: Christopher Aillon <caillon@src.gnome.org>
@@ -4998,7 +5318,7 @@ Date:   Tue Nov 8 18:43:09 2005 +0000
     get rid of spurious newline
 
  src/krb5-auth-dialog.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 050ee55e0a75743ca237e973b7ba20fc93047956
 Author: Christopher Aillon <caillon@src.gnome.org>
@@ -5007,7 +5327,7 @@ Date:   Thu Nov 3 23:07:03 2005 +0000
     Update .cvsignore to contain the generated manpage
 
  src/.cvsignore |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
 
 commit f0a0f0a4669b43d5fa4c80c50feb52393a31d36d
 Author: Christopher Aillon <caillon@redhat.com>
@@ -5050,7 +5370,7 @@ Date:   Wed Nov 2 23:50:54 2005 +0000
  krb5-auth-dialog.spec.in  |    1 +
  src/Makefile.am           |    4 +++-
  src/krb5-auth-dialog.1.in |   37 +++++++++++++++++++++++++++++++++++++
- 4 files changed, 45 insertions(+), 1 deletions(-)
+ 4 files changed, 45 insertions(+), 1 deletion(-)
 
 commit 56e4dbdc960a1c9cbf4a505ea1655afc7500b0b5
 Author: Nalin Dahyabhai <nalin@src.gnome.org>
@@ -5095,7 +5415,7 @@ Date:   Wed Nov 2 23:11:08 2005 +0000
  ChangeLog      |    7 ++++++-
  etpo/grammar.y |    2 ++
  etpo/lexer.l   |    1 +
- 3 files changed, 9 insertions(+), 1 deletions(-)
+ 3 files changed, 9 insertions(+), 1 deletion(-)
 
 commit 9cdca989ba151bf946d788a03f3b46b5201a00e1
 Author: Nalin Dahyabhai <nalin@src.gnome.org>
@@ -5107,9 +5427,9 @@ Date:   Wed Nov 2 23:10:01 2005 +0000
     * src/krb5-auth-dialog.c: abstract out differences in how credential flags
     	and realm names are stored.
 
- ChangeLog              |    7 +++
- configure.ac           |   45 +++++++++++++++++++--
- src/krb5-auth-dialog.c |   98 ++++++++++++++++++++++++++++++++++++++++++++---
+ ChangeLog              |    7 ++++
+ configure.ac           |   45 +++++++++++++++++++---
+ src/krb5-auth-dialog.c |   98 ++++++++++++++++++++++++++++++++++++++++++++----
  3 files changed, 138 insertions(+), 12 deletions(-)
 
 commit 71f27e6c5ae6635e6da9a716e67f94fa50c7ad01
@@ -5119,7 +5439,7 @@ Date:   Wed Nov 2 09:37:10 2005 +0000
     Update
 
  po/nb.po | 1254 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 629 insertions(+), 625 deletions(-)
+ 1 file changed, 629 insertions(+), 625 deletions(-)
 
 commit 5b350fa28c3089b6bcae956550d97eecab5bad8f
 Author: Christopher Aillon <caillon@redhat.com>
@@ -5133,7 +5453,7 @@ Date:   Tue Nov 1 17:47:46 2005 +0000
 
  ChangeLog    |    4 ++++
  configure.ac |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 97bd5dadd3551c8082529888a3b42835e2c9b75f
 Author: Christopher Aillon <caillon@redhat.com>
@@ -5181,7 +5501,7 @@ Date:   Mon Oct 31 22:01:17 2005 +0000
 
  ChangeLog    |    4 ++++
  configure.ac |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit b37ce6e5cb174556f6d1d502601787bdbfcb57a2
 Author: Christopher Aillon <caillon@redhat.com>
@@ -5256,7 +5576,7 @@ Date:   Mon Oct 31 07:22:41 2005 +0000
 
  ChangeLog              |    5 +++++
  src/krb5-auth-dialog.c |    4 +++-
- 2 files changed, 8 insertions(+), 1 deletions(-)
+ 2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 3b7aa460f83b8b07cfeee817064b68e5721e69ff
 Author: Christopher Aillon <caillon@redhat.com>
@@ -5268,8 +5588,8 @@ Date:   Mon Oct 31 07:05:30 2005 +0000
     
     	* src/krb5-auth-dialog.c: Update the credentials expiry time
 
- ChangeLog              |    4 +++
- src/krb5-auth-dialog.c |   62 ++++++++++++++++++++++++++++++++++++++---------
+ ChangeLog              |    4 ++++
+ src/krb5-auth-dialog.c |   62 ++++++++++++++++++++++++++++++++++++++----------
  2 files changed, 54 insertions(+), 12 deletions(-)
 
 commit 023f791dc1a2cf57879dc6a910f41de802033bd8
@@ -5315,10 +5635,10 @@ Date:   Sat Oct 29 18:42:16 2005 +0000
     	* src/krb5-auth-dialog.c: Use libnm-glib for NetworkManager support
     	instead of the NetworkManager D-BUS API.
 
- ChangeLog              |    7 ++
+ ChangeLog              |    7 +++
  configure.ac           |   35 ++++++-----
  src/Makefile.am        |    2 +-
- src/krb5-auth-dialog.c |  152 +++++++++++++++--------------------------------
+ src/krb5-auth-dialog.c |  152 ++++++++++++++++--------------------------------
  4 files changed, 76 insertions(+), 120 deletions(-)
 
 commit 07816942fa9d84644a07948b77dce9a8f1f26af8
@@ -5356,7 +5676,7 @@ Date:   Wed Nov 3 21:21:19 2004 +0000
     Update BuildRequires
 
  krb5-auth-dialog.spec.in |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 commit 3276af0e6957288cccf57170879c5b0ca74d07ba
 Author: Christopher Aillon <caillon@redhat.com>
@@ -5395,7 +5715,7 @@ Date:   Thu Sep 2 05:00:59 2004 +0000
     	* src/krb5-auth-dialog.c (credentials_expiring): Don't
     	try to renew credentials if we're not online.
 
- ChangeLog              |   14 ++++++-
+ ChangeLog              |   14 +++++-
  configure.ac           |   20 ++++++++-
  src/Makefile.am        |    2 +-
  src/krb5-auth-dialog.c |  110 +++++++++++++++++++++++++++++++++++++++++++++++-
@@ -5431,7 +5751,7 @@ Date:   Thu Aug 19 15:20:15 2004 +0000
 
  ChangeLog    |    4 ++++
  configure.ac |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 712282241c5ed5e5739f7df6575357f7b5121d08
 Author: Kjartan Maraas <kmaraas@gnome.org>
@@ -5447,7 +5767,7 @@ Date:   Thu Aug 19 15:19:47 2004 +0000
  po/ChangeLog |    5 +
  po/nb.po     | 3116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  po/no.po     | 3116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 6237 insertions(+), 0 deletions(-)
+ 3 files changed, 6237 insertions(+)
 
 commit 1a214e68cf5d2512bf3fc50d5e0d3ee5661e4254
 Author: Christopher Aillon <caillon@src.gnome.org>
@@ -5458,7 +5778,7 @@ Date:   Wed Aug 18 21:39:53 2004 +0000
  ChangeLog        |    8 ++++++++
  configure.ac     |    2 +-
  etpo/Makefile.am |    2 ++
- 3 files changed, 11 insertions(+), 1 deletions(-)
+ 3 files changed, 11 insertions(+), 1 deletion(-)
 
 commit 036a91201e0c744935338b61418d126ff5cb1ea3
 Author: Christopher Aillon <caillon@src.gnome.org>
@@ -5477,7 +5797,7 @@ Date:   Tue Aug 17 19:31:14 2004 +0000
     shut up CVS
 
  etpo/.cvsignore |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
 
 commit 915143d4e33c2258353fdae273ebd87fa61f012b
 Author: Jonathan Blandford <jrb@src.gnome.org>
@@ -5486,7 +5806,7 @@ Date:   Tue Aug 17 19:29:03 2004 +0000
     forgot this
 
  src/dummy-strings.c |  645 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 645 insertions(+), 0 deletions(-)
+ 1 file changed, 645 insertions(+)
 
 commit 7d2c876c01b7e2ebed3ff4487d4939c921f119dc
 Author: Jonathan Blandford <jrb@redhat.com>
@@ -5523,12 +5843,12 @@ Date:   Tue Aug 17 17:55:09 2004 +0000
 
  ChangeLog        |    6 ++
  Makefile.am      |    2 +-
- README           |   12 ++++-
+ README           |   12 +++-
  autogen.sh       |    2 +-
  configure.ac     |    3 +
  etpo/Makefile.am |    6 ++
  etpo/README      |    8 +++
- etpo/grammar.y   |   76 ++++++++++++++++++++++++
+ etpo/grammar.y   |   76 +++++++++++++++++++++++++
  etpo/lexer.l     |  167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  9 files changed, 279 insertions(+), 3 deletions(-)
 
@@ -5540,7 +5860,7 @@ Date:   Tue Aug 17 17:43:39 2004 +0000
 
  configure.ac           |    1 +
  src/krb5-auth-dialog.c |   11 ++++++++++-
- 2 files changed, 11 insertions(+), 1 deletions(-)
+ 2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit 3e72ab13d91302179ad763ad0794b778484d4e39
 Author: Jonathan Blandford <jrb@src.gnome.org>
@@ -5549,7 +5869,7 @@ Date:   Mon Aug 16 19:42:04 2004 +0000
     update-po
 
  po/krb5-auth-dialog.pot |   14 +++-----------
- 1 files changed, 3 insertions(+), 11 deletions(-)
+ 1 file changed, 3 insertions(+), 11 deletions(-)
 
 commit 9357e0c877835924d924baef5fac295b23a94239
 Author: Jonathan Blandford <jrb@src.gnome.org>
@@ -5560,7 +5880,7 @@ Date:   Mon Aug 16 19:40:41 2004 +0000
  .cvsignore               |    1 +
  configure.ac             |    1 +
  krb5-auth-dialog.spec.in |   41 +++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 43 insertions(+), 0 deletions(-)
+ 3 files changed, 43 insertions(+)
 
 commit e3447c1ddde1eb3aa6d29d0c56393920a5a5a197
 Author: Jonathan Blandford <jrb@src.gnome.org>
@@ -5569,7 +5889,7 @@ Date:   Mon Aug 16 19:23:17 2004 +0000
     minor code cleanup
 
  src/krb5-auth-dialog.c |  196 ++++++++++++++++++++++++------------------------
- 1 files changed, 98 insertions(+), 98 deletions(-)
+ 1 file changed, 98 insertions(+), 98 deletions(-)
 
 commit 9b56d8959f80d463e4dde321c1bb645fd56fe71a
 Author: Jonathan Blandford <jrb@src.gnome.org>
@@ -5582,7 +5902,7 @@ Date:   Mon Aug 16 19:15:11 2004 +0000
  README         |    2 ++
  po/.cvsignore  |    3 +++
  src/.cvsignore |    3 +++
- 5 files changed, 22 insertions(+), 0 deletions(-)
+ 5 files changed, 22 insertions(+)
 
 commit c28fa3ea9736fc16427af635375c439c421e9e8e
 Author: Jonathan Blandford <jrb@src.gnome.org>
@@ -5591,7 +5911,7 @@ Date:   Mon Aug 16 19:10:50 2004 +0000
     make some labels untranslatable
 
  src/krb5-auth-dialog.glade |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 43cdd4ded927bd5e546ce1bc08ff56e8d92d4063
 Author: Jonathan Blandford <jrb@src.gnome.org>
@@ -5615,4 +5935,4 @@ Date:   Mon Aug 16 19:07:30 2004 +0000
  src/Makefile.am            |   17 +++
  src/krb5-auth-dialog.c     |  282 ++++++++++++++++++++++++++++++++++++++++++++
  src/krb5-auth-dialog.glade |  253 +++++++++++++++++++++++++++++++++++++++
- 10 files changed, 921 insertions(+), 0 deletions(-)
+ 10 files changed, 921 insertions(+)
diff --git a/INSTALL b/INSTALL
index 7d1c323..a1e89e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
diff --git a/Makefile.in b/Makefile.in
index 87d8e02..5f1b7ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,11 +69,11 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = krb5-auth-dialog.spec
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -67,6 +84,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -79,9 +101,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -107,9 +131,11 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.xz
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -143,19 +169,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -170,6 +193,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -260,6 +287,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -269,6 +297,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -309,7 +339,7 @@ all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -345,10 +375,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -541,13 +569,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -580,16 +605,20 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
+
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
-
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -606,8 +635,7 @@ dist-zip: distdir
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -621,6 +649,8 @@ distcheck: dist
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -630,7 +660,7 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
@@ -640,6 +670,7 @@ distcheck: dist
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -668,8 +699,16 @@ distcheck: dist
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -700,10 +739,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -792,18 +836,19 @@ uninstall-am:
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am
+	dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 
 dist-hook:
diff --git a/NEWS b/NEWS
index 02b241d..04a944a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,27 @@
+===========
+Version 3.8
+===========
+* Use an app menu instead of a menu bar
+
+==============
+Version 3.7.92
+==============
+* Use GSettings instead of GConf
+* Hide configuration tickets by default (BZ#649830)
+* UI translations:
+	Bruno Brouard (fr)
+	Daniel Mustieles (es)
+	Enrico Nicoletto (pt_BR)
+	Fran Diéguez (gl)
+	Marek Černocký (cs)
+	Martin Srebotnjak (sl)
+	Matej Urbančič (sl)
+	Rafael Ferreira (pt_BR)
+	Zdeněk Hataš (cs)
+
+* Doc translations:
+	Daniel Winzen (de)
+
 ==============
 Version 3.2.1
 ==============
diff --git a/README b/README
index 9eb5bae..8a2d036 100644
--- a/README
+++ b/README
@@ -4,22 +4,54 @@ it to be part of GNOME.
 
 Configuration
 =============
-Configuration settings are handled via gconf.
+Configuration settings are handled via gsettings.
 
 You can set the principal that is used to acquire tickets via:
-gconftool-2 --type=string --set /apps/krb5-auth-dialog/principal "principal@YOUR.REALM"
-
-You can hide the tray icon via:
-gconftool-2 --type=bool --set /apps/krb5-auth-dialog/show_trayicon false
+gsettings set org.gnome.KrbAuthDialog principal "principal@YOUR.REALM"
 
 You can set the time of the first password prompt via:
-gconftool-2 --type=int --set /apps/krb5-auth-dialog/prompt_minutes 30
+gsettings set org.gnome.KrbAuthDialog prompt-minutes 30
 
 You can set the principals pkinit identifier via:
-gconftool-2 --type=string --set /apps/krb5-auth-dialog/pk_userid "FILE:/path/to/user.pem,/path/to/user.key"
+gsettings set org.gnome.KrbAuthDialog pk-userid "FILE:/path/to/user.pem,/path/to/user.key"
+
 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"
+gsettings set org.gnome.KrbAuthDialog pk-userid "PKCS11:/usr/lib/opensc/opensc-pkcs11.so"
+
+DBus API
+========
+You can request a ticket granting ticket via DBus:
+
+ dbus-send --print-reply --type=method_call \
+              --dest=org.gnome.KrbAuthDialog \
+               /org/gnome/KrbAuthDialog \
+               org.gnome.KrbAuthDialog.acquireTgt \
+               string:'principal'
+
+If the sent principal doesn't match the one currently in the ticket cache the
+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. Individual plugins can be enabled via gsettings:
+
+Enable pam and dummy plugions:
+.
+
+You can set the principal that is used to acquire tickets via:
+gsettings set org.gnome.KrbAuthDialog principal "principal@YOUR.REALM"
+
+You can set the time of the first password prompt via:
+gsettings set org.gnome.KrbAuthDialog prompt-minutes 30
+
+You can set the principals pkinit identifier via:
+gsettings set org.gnome.KrbAuthDialog pk-userid "FILE:/path/to/user.pem,/path/to/user.key"
+
+or if you're using a smartcard:
+gsettings set org.gnome.KrbAuthDialog pk-userid "PKCS11:/usr/lib/opensc/opensc-pkcs11.so"
 
 DBus API
 ========
@@ -39,13 +71,13 @@ 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:
+Plugins are currently disabled by default. Individual plugins can be enabled via gsettings:
 
 Enable pam and dummy plugions:
-gconftool-2 --set --list-type=string --type=list  /apps/krb5-auth-dialog/plugins/enabled [pam,dummy]
+gsettings set org.gnome.KrbAuthDialog.plugins enabled "['pam', 'dummy']"
 
 To list currently enabled plugins:
-gconftool-2 --get --list-type=string  /apps/krb5-auth-dialog/plugins/enabled
+gsettings get org.gnome.KrbAuthDialog.plugins enabled
 
 
 A Note on Translations
diff --git a/aclocal.m4 b/aclocal.m4
index 307cd91..14309d9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,57 +14,12 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH([gconf-source],
-	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-			     [Config database for installing schema files.]),
-	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH([gconf-schema-file-dir],
-	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-			     [Directory for installing schema files.]),
-	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-  	AC_HELP_STRING([--disable-schemas-install],
-		       [Disable the schemas installation]),
-     [case ${enableval} in
-       yes|no) ;;
-       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-      esac])
-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
-
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
 #
@@ -305,6 +261,10 @@ msgstr ""
 	      [CATOBJEXT=.mo
                DATADIRNAME=lib])
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -497,9 +457,93 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
 fi])
 
 
+dnl GLIB_GSETTINGS
+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
+dnl the schema should be compiled
+dnl
+
+AC_DEFUN([GLIB_GSETTINGS],
+[
+  m4_pattern_allow([AM_V_GEN])
+  AC_ARG_ENABLE(schemas-compile,
+                AS_HELP_STRING([--disable-schemas-compile],
+                               [Disable regeneration of gschemas.compiled on install]),
+                [case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
+                 esac])
+  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
+  PKG_PROG_PKG_CONFIG([0.16])
+  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
+  fi
+  AC_SUBST(GLIB_COMPILE_SCHEMAS)
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
+  else
+    ifelse([$1],,[:],[$1])
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+endif
+'
+  _GSETTINGS_SUBST(GSETTINGS_RULES)
+])
+
+dnl _GSETTINGS_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_GSETTINGS_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
+# serial 42 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL], [
 AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_NLS])dnl
@@ -512,13 +556,11 @@ case "$am__api_version" in
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n "$1"; then
     AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
     AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
 	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
@@ -531,25 +573,48 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT";
     AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 
 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -595,7 +660,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
    AC_MSG_ERROR([perl 5.8.1 is required for intltool])
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then
@@ -694,8 +759,8 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -704,8 +769,8 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -839,6 +904,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -1324,7 +1391,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -1488,6 +1555,7 @@ AC_DEFUN([LT_LANG],
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -1509,6 +1577,29 @@ m4_defun([_LT_LANG],
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -1539,6 +1630,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -1641,7 +1736,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1649,6 +1750,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -1660,6 +1762,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -1677,7 +1780,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1722,8 +1827,8 @@ _LT_EOF
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1734,6 +1839,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -2017,14 +2124,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -2101,13 +2221,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -2287,6 +2407,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -2326,7 +2451,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2872,7 +2997,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2881,7 +3006,7 @@ aix3*)
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2946,7 +3071,7 @@ beos*)
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -3085,7 +3210,7 @@ m4_if([$1], [],[
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -3093,10 +3218,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -3104,7 +3225,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -3122,7 +3243,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -3141,19 +3262,8 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -3214,7 +3324,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -3230,7 +3340,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -3267,9 +3377,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3344,7 +3454,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -3413,7 +3523,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3438,7 +3548,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3462,7 +3572,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -3493,7 +3603,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3503,7 +3613,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3884,10 +3994,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3925,8 +4031,8 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4345,6 +4451,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4677,7 +4784,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4929,7 +5036,9 @@ m4_if([$1], [CXX], [
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4974,7 +5083,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -5021,18 +5130,33 @@ m4_if([$1], [CXX], [
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -5192,7 +5316,9 @@ m4_if([$1], [CXX], [
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -5220,7 +5346,6 @@ m4_if([$1], [CXX], [
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -5474,8 +5599,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5771,6 +5895,7 @@ _LT_EOF
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5817,10 +5942,6 @@ _LT_EOF
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5833,7 +5954,7 @@ _LT_EOF
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5872,7 +5993,6 @@ _LT_EOF
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -6314,9 +6434,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -6470,7 +6587,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6840,7 +6956,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6856,9 +6972,6 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -7020,7 +7133,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -7601,12 +7714,18 @@ public class foo {
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7803,7 +7922,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7936,7 +8054,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -8119,6 +8236,73 @@ CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -8188,6 +8372,13 @@ dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -8852,9 +9043,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -9026,15 +9232,15 @@ m4_define([lt_dict_filter],
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
@@ -9331,12 +9537,15 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -9346,7 +9555,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -9362,19 +9571,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -9456,14 +9667,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -9503,6 +9714,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -9567,7 +9779,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -9632,10 +9844,13 @@ AC_DEFUN([AM_DEP_TRACK],
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -9857,12 +10072,15 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -9902,8 +10120,8 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9923,7 +10141,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
 [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
@@ -10069,12 +10287,15 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -10097,13 +10318,14 @@ esac
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -10111,13 +10333,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -10193,13 +10415,13 @@ Check your system clock])
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
@@ -10214,18 +10436,50 @@ yes) AM_DEFAULT_VERBOSITY=0;;
 no)  AM_DEFAULT_VERBOSITY=1;;
 *)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
+dnl
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -10248,13 +10502,13 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -10263,13 +10517,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10291,10 +10545,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/compile b/compile
index c0096a7..862a14e 100755
--- a/compile
+++ b/compile
@@ -1,10 +1,10 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
+# Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2012-03-05.13; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -29,21 +29,219 @@ scriptversion=2009-10-06.20; # UTC
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 
 If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
+right script to run: please start by reading the file 'INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
@@ -53,11 +251,13 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
 esac
 
 ofile=
 cfile=
-eat=
 
 for arg
 do
@@ -66,8 +266,8 @@ do
   else
     case $1 in
       -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
@@ -94,10 +294,10 @@ do
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
+  # If no '-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
+  # '.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$@"
 fi
@@ -106,7 +306,7 @@ fi
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
diff --git a/config.guess b/config.guess
index 40eaed4..d622a44 100755
--- a/config.guess
+++ b/config.guess
@@ -2,9 +2,9 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-05-11'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2011-05-11'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -792,13 +790,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -807,6 +804,9 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -861,6 +861,13 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -895,13 +902,16 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -943,7 +953,7 @@ EOF
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -978,13 +988,13 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1315,6 +1325,9 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.sub b/config.sub
index 30fdca8..6205f84 100755
--- a/config.sub
+++ b/config.sub
@@ -2,9 +2,9 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-03-23'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2011-03-23'
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@ version="\
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +130,10 @@ case $maybe_os in
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -223,6 +225,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,17 +255,22 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +304,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -300,7 +313,7 @@ case $basic_machine in
 	| spu \
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -315,8 +328,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -329,7 +341,10 @@ case $basic_machine in
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -352,11 +367,13 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -365,8 +382,10 @@ case $basic_machine in
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -400,7 +419,7 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +427,11 @@ case $basic_machine in
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -711,7 +731,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -808,10 +827,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -1120,13 +1147,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	# This must be matched before tile*.
-	tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1336,7 +1358,7 @@ case $os in
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1521,6 +1543,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
@@ -1548,9 +1573,6 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
diff --git a/configure b/configure
index 4572dc7..a11601a 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for krb5-auth-dialog 3.2.1.
+# Generated by GNU Autoconf 2.69 for krb5-auth-dialog 3.8.0.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -220,21 +244,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -336,6 +364,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -457,6 +493,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -491,16 +531,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -512,28 +552,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -567,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='krb5-auth-dialog'
 PACKAGE_TARNAME='krb5-auth-dialog'
-PACKAGE_VERSION='3.2.1'
-PACKAGE_STRING='krb5-auth-dialog 3.2.1'
+PACKAGE_VERSION='3.8.0'
+PACKAGE_STRING='krb5-auth-dialog 3.8.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -631,19 +651,16 @@ KRB5_LIBS
 KRB5_CFLAGS
 KRB5_CONFIG
 SC_PKCS11
-GCONFTOOL
-GCONF_SCHEMAS_INSTALL_FALSE
-GCONF_SCHEMAS_INSTALL_TRUE
-GCONF_SCHEMA_FILE_DIR
-GCONF_SCHEMA_CONFIG_SOURCE
+GSETTINGS_RULES
+GLIB_COMPILE_SCHEMAS
+gsettingsschemadir
+GSETTINGS_DISABLE_SCHEMAS_COMPILE
 LIBNOTIFY_LIBS
 LIBNOTIFY_CFLAGS
 GMODULE_LIBS
 GMODULE_CFLAGS
 GIO_LIBS
 GIO_CFLAGS
-GCONF_LIBS
-GCONF_CFLAGS
 GTK_LIBS
 GTK_CFLAGS
 HAVE_GNOME_DOC_UTILS_FALSE
@@ -711,6 +728,7 @@ DATADIRNAME
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -749,12 +767,20 @@ INTLTOOL_PROP_RULE
 INTLTOOL_KEYS_RULE
 INTLTOOL_DIRECTORY_RULE
 INTLTOOL_DESKTOP_RULE
+intltool__v_merge_options_0
+intltool__v_merge_options_
+INTLTOOL_V_MERGE_OPTIONS
+INTLTOOL__v_MERGE_0
+INTLTOOL__v_MERGE_
+INTLTOOL_V_MERGE
 INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
 USE_NLS
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -839,9 +865,7 @@ with_help_dir
 with_omf_dir
 with_help_formats
 enable_scrollkeeper
-with_gconf_source
-with_gconf_schema_file_dir
-enable_schemas_install
+enable_schemas_compile
 enable_debug
 with_pkcs11
 enable_pkinit
@@ -865,8 +889,6 @@ PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 GTK_CFLAGS
 GTK_LIBS
-GCONF_CFLAGS
-GCONF_LIBS
 GIO_CFLAGS
 GIO_LIBS
 GMODULE_CFLAGS
@@ -1330,8 +1352,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1417,7 +1437,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures krb5-auth-dialog 3.2.1 to adapt to many kinds of systems.
+\`configure' configures krb5-auth-dialog 3.8.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1488,7 +1508,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of krb5-auth-dialog 3.2.1:";;
+     short | recursive ) echo "Configuration of krb5-auth-dialog 3.8.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1512,8 +1532,8 @@ Optional Features:
                           Turn on compiler warnings
   --enable-iso-c          Try to warn if code is not ISO C
   --disable-scrollkeeper  do not make updates to the scrollkeeper database
-  --disable-schemas-install
-                          Disable the schemas installation
+  --disable-schemas-compile
+                          Disable regeneration of gschemas.compiled on install
   --enable-debug=no/yes   enable debugging output
   --enable-pkinit         whether to enable preauth via pkinit support
   --enable-network-manager
@@ -1523,7 +1543,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1532,10 +1552,6 @@ Optional Packages:
   --with-omf-dir=DIR      path to OMF files
   --with-help-formats=FORMATS
                           list of formats
-  --with-gconf-source=sourceaddress
-                          Config database for installing schema files.
-  --with-gconf-schema-file-dir=dir
-                          Directory for installing schema files.
   --with-pkcs11           set path of PKCS11 smartcard helper
                           [default=/usr/lib/opensc/opensc-pkcs11.so]
   --without-libcap        Disable support for capabilities library
@@ -1563,9 +1579,6 @@ Some influential environment variables:
               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
-  GCONF_CFLAGS
-              C compiler flags for GCONF, overriding pkg-config
-  GCONF_LIBS  linker flags for GCONF, overriding pkg-config
   GIO_CFLAGS  C compiler flags for GIO, overriding pkg-config
   GIO_LIBS    linker flags for GIO, overriding pkg-config
   GMODULE_CFLAGS
@@ -1647,10 +1660,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-krb5-auth-dialog configure 3.2.1
-generated by GNU Autoconf 2.68
+krb5-auth-dialog configure 3.8.0
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1726,7 +1739,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2069,8 +2082,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by krb5-auth-dialog $as_me 3.2.1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by krb5-auth-dialog $as_me 3.8.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2486,7 +2499,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2655,7 +2668,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2695,7 +2708,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2746,7 +2759,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2799,7 +2812,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2885,7 +2898,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='krb5-auth-dialog'
- VERSION='3.2.1'
+ VERSION='3.8.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2915,11 +2928,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -2961,6 +2974,33 @@ yes) AM_DEFAULT_VERBOSITY=0;;
 no)  AM_DEFAULT_VERBOSITY=1;;
 *)   AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 
@@ -3030,6 +3070,7 @@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3062,7 +3103,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3102,7 +3143,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3155,7 +3196,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3196,7 +3237,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3254,7 +3295,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3298,7 +3339,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3744,8 +3785,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3843,6 +3883,7 @@ else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3902,7 +3943,7 @@ else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -3968,14 +4009,12 @@ case "$am__api_version" in
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n "0.35.0"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
 $as_echo_n "checking for intltool >= 0.35.0... " >&6; }
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
@@ -4000,7 +4039,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4040,7 +4079,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4080,7 +4119,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4106,25 +4145,48 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT";
     as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'
+
+
+
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+
+
+
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
 
 
 
@@ -4241,7 +4303,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4281,7 +4343,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4321,7 +4383,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4361,7 +4423,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4412,7 +4474,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4443,7 +4505,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
    as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
@@ -4665,7 +4727,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4731,7 +4793,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5406,7 +5468,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5493,6 +5555,10 @@ else
 fi
 
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -5635,7 +5701,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5675,7 +5741,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5728,7 +5794,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5769,7 +5835,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -5827,7 +5893,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5871,7 +5937,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6067,8 +6133,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -6166,6 +6231,7 @@ else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -6225,7 +6291,7 @@ else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -6456,8 +6522,8 @@ esac
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -6635,7 +6701,7 @@ do
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -6714,7 +6780,7 @@ do
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -6970,7 +7036,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7014,7 +7080,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7172,6 +7238,11 @@ else
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -7211,7 +7282,7 @@ else
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -7433,7 +7504,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7473,7 +7544,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7599,10 +7670,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -7640,8 +7707,8 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -7779,7 +7846,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7819,7 +7886,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7922,7 +7989,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7966,7 +8033,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8091,7 +8158,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8131,7 +8198,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8190,7 +8257,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8230,7 +8297,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8280,13 +8347,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -8433,6 +8500,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -8821,7 +8889,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -8832,7 +8900,20 @@ sparc*-*solaris*)
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -8865,7 +8946,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8905,7 +8986,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8985,7 +9066,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9025,7 +9106,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9077,7 +9158,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9117,7 +9198,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9169,7 +9250,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9209,7 +9290,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9261,7 +9342,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9301,7 +9382,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9353,7 +9434,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9393,7 +9474,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9472,7 +9553,13 @@ else
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -9483,6 +9570,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -9515,6 +9603,7 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -9536,7 +9625,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -9674,7 +9765,22 @@ fi
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -9752,6 +9858,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -10207,7 +10317,9 @@ lt_prog_compiler_static=
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -10251,7 +10363,7 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -10298,18 +10410,33 @@ lt_prog_compiler_static=
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -10671,7 +10798,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -10924,8 +11050,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -11305,6 +11430,7 @@ fi
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -11350,6 +11476,7 @@ fi
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -11378,10 +11505,6 @@ fi
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -11394,7 +11517,7 @@ fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -11433,7 +11556,6 @@ fi
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -12057,11 +12179,6 @@ esac
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -12151,7 +12268,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -12160,7 +12277,7 @@ aix3*)
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -12225,7 +12342,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -12364,7 +12481,7 @@ darwin* | rhapsody*)
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -12372,10 +12489,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -12383,7 +12496,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -12401,7 +12514,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -12420,19 +12533,8 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -12493,7 +12595,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -12509,7 +12611,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -12546,9 +12648,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12642,7 +12744,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -12711,7 +12813,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12736,7 +12838,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12760,7 +12862,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -12791,7 +12893,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12801,7 +12903,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -13583,6 +13685,8 @@ CC="$lt_save_CC"
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -13609,7 +13713,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LEX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13641,7 +13745,8 @@ a { ECHO; }
 b { REJECT; }
 c { yymore (); }
 d { yyless (1); }
-e { yyless (input () != 0); }
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
+    yyless ((input () != 0)); }
 f { unput (yytext[0]); }
 . { BEGIN INITIAL; }
 %%
@@ -13767,7 +13872,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_YACC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14098,7 +14203,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14141,7 +14246,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14277,7 +14382,6 @@ fi
 
 GTK_REQUIRED=3.0
 GLIB_REQUIRED=2.28
-GCONF_REQUIRED=2.31
 LIBNOTIFY_REQUIRED=0.7.0
 
 
@@ -14373,97 +14477,6 @@ $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 "$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=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-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=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- 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
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
-        else
-	        GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gconf-2.0 >= $GCONF_REQUIRED" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GCONF_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gconf-2.0 >= $GCONF_REQUIRED) were not met:
-
-$GCONF_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-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
-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
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-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.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
-	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" >&5
 $as_echo_n "checking for GIO... " >&6; }
 
@@ -14738,66 +14751,152 @@ fi
 
 
 
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
 
-# Check whether --with-gconf-source was given.
-if test "${with_gconf_source+set}" = set; then :
-  withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
+  # Check whether --enable-schemas-compile was given.
+if test "${enable_schemas_compile+set}" = set; then :
+  enableval=$enable_schemas_compile; case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
+                 esac
 fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
 
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
 
 
-# Check whether --with-gconf-schema-file-dir was given.
-if test "${with_gconf_schema_file_dir+set}" = set; then :
-  withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&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.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-  # Check whether --enable-schemas-install was given.
-if test "${enable_schemas_install+set}" = set; then :
-  enableval=$enable_schemas_install; case ${enableval} in
-       yes|no) ;;
-       *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
-      esac
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-   if test "$enable_schemas_install" != no; then
-  GCONF_SCHEMAS_INSTALL_TRUE=
-  GCONF_SCHEMAS_INSTALL_FALSE='#'
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  GCONF_SCHEMAS_INSTALL_TRUE='#'
-  GCONF_SCHEMAS_INSTALL_FALSE=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
 
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.16
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+  gsettingsschemadir=${datadir}/glib-2.0/schemas
 
-# Extract the first word of "gconftool-2", so it can be a program name with args.
-set dummy gconftool-2; ac_word=$2
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    # Extract the first word of "glib-compile-schemas", so it can be a program name with args.
+set dummy glib-compile-schemas; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GCONFTOOL+:} false; then :
+if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $GCONFTOOL in
+  case $GLIB_COMPILE_SCHEMAS in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path.
+  ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -14806,8 +14905,8 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -14815,23 +14914,74 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
   ;;
 esac
 fi
-GCONFTOOL=$ac_cv_path_GCONFTOOL
-if test -n "$GCONFTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
-$as_echo "$GCONFTOOL" >&6; }
+GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS
+if test -n "$GLIB_COMPILE_SCHEMAS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5
+$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-if test "$GCONFTOOL" = "no"; then
-  as_fn_error $? "gconftool-2 not found" "$LINENO" 5
-fi
+  fi
+
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5
+  else
+    :
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" $^ > $@.tmp && mv $@.tmp $@
+endif
+'
+
+
+
+
+
+
 
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
@@ -14882,7 +15032,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15552,7 +15702,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_SETCAP="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15911,10 +16061,6 @@ if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FAL
   as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ENABLE_PKINIT_TRUE}" && test -z "${ENABLE_PKINIT_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_PKINIT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16225,16 +16371,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -16294,28 +16440,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -16336,8 +16470,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by krb5-auth-dialog $as_me 3.2.1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by krb5-auth-dialog $as_me 3.8.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -16402,11 +16536,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-krb5-auth-dialog config.status 3.2.1
-configured by $0, generated by GNU Autoconf 2.68,
+krb5-auth-dialog config.status 3.8.0
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -16497,7 +16631,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -16540,6 +16674,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -16622,7 +16757,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -16678,6 +16812,7 @@ _LTECHO_EOF'
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -16728,7 +16863,6 @@ with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -17542,8 +17676,8 @@ $as_echo X"$file" |
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -17597,6 +17731,9 @@ SHELL=$lt_SHELL
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -17898,10 +18035,6 @@ no_undefined_flag=$lt_no_undefined_flag
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -18227,8 +18360,6 @@ $as_echo "$as_me: " >&6;}
 $as_echo "$as_me:          Kerberos: $KRB5_CFLAGS $KRB5_LIBS" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}:               GTK: $GTK_CFLAGS $GTK_LIBS" >&5
 $as_echo "$as_me:               GTK: $GTK_CFLAGS $GTK_LIBS" >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}:             gconf: $GCONF_CFLAGS $GCONF_LIBS" >&5
-$as_echo "$as_me:             gconf: $GCONF_CFLAGS $GCONF_LIBS" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}:          gio-unix: $GIO_UNIX_CFLAGS $GIO_UNIX_LIBS $GIO_CFLAGS $GIO_LIBS" >&5
 $as_echo "$as_me:          gio-unix: $GIO_UNIX_CFLAGS $GIO_UNIX_LIBS $GIO_CFLAGS $GIO_LIBS" >&6;}
 if test "$with_libnotify" = "yes" ; then
diff --git a/configure.ac b/configure.ac
index 43c84e6..2b21405 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
-AC_INIT([krb5-auth-dialog],[3.2.1])
+AC_INIT([krb5-auth-dialog],[3.8.0])
 AC_CONFIG_SRCDIR(src/ka-kerberos.c)
 dnl Make automake keep quiet about wildcards & other GNUmake-isms
-AM_INIT_AUTOMAKE([1.11.1 dist-bzip2 -Wno-portability])
+AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz -Wno-portability])
 AC_CONFIG_HEADERS([config.h])
 
 AM_MAINTAINER_MODE
@@ -29,11 +29,9 @@ GNOME_DOC_INIT
 
 GTK_REQUIRED=3.0
 GLIB_REQUIRED=2.28
-GCONF_REQUIRED=2.31
 LIBNOTIFY_REQUIRED=0.7.0
 
 PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED])
-PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED)
 PKG_CHECK_MODULES(GIO, [gio-2.0, gio-unix-2.0])
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
 PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
@@ -41,12 +39,7 @@ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
 dnl check for deprecated symbols:
 dnl GNOME_MAINTAINER_MODE_DEFINES
 
-AM_GCONF_SOURCE_2
-
-AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no])
-if test "$GCONFTOOL" = "no"; then
-  AC_MSG_ERROR([gconftool-2 not found])
-fi
+GLIB_GSETTINGS
 
 dnl --enable-debug=(yes|no)
 AC_ARG_ENABLE(debug,
@@ -261,7 +254,6 @@ AC_MSG_NOTICE([Libraries])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([         Kerberos: $KRB5_CFLAGS $KRB5_LIBS])
 AC_MSG_NOTICE([              GTK: $GTK_CFLAGS $GTK_LIBS])
-AC_MSG_NOTICE([            gconf: $GCONF_CFLAGS $GCONF_LIBS])
 AC_MSG_NOTICE([         gio-unix: $GIO_UNIX_CFLAGS $GIO_UNIX_LIBS $GIO_CFLAGS $GIO_LIBS])
 if test "$with_libnotify" = "yes" ; then
 AC_MSG_NOTICE([        libnotify: $LIBNOTIFY_CFLAGS $LIBNOTIFY_LIBS])
diff --git a/depcomp b/depcomp
index df8eea7..25a39e6 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ scriptversion=2009-04-28.21; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,11 +40,11 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +57,12 @@ EOF
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -90,10 +96,24 @@ if test "$depmode" = msvcmsys; then
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -148,20 +168,21 @@ gcc)
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -193,18 +214,15 @@ sgi)
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -216,10 +234,17 @@ sgi)
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -249,12 +274,11 @@ aix)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -265,23 +289,26 @@ aix)
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -290,15 +317,21 @@ icc)
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Each line is of the form 'foo.o: dependent.h',
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -334,7 +367,7 @@ hp2)
   done
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
@@ -349,9 +382,9 @@ hp2)
 
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
+   # dependencies in 'foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    test "x$dir" = "x$object" && dir=
@@ -397,14 +430,59 @@ tru64)
    done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -422,7 +500,7 @@ dashmstdout)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -442,15 +520,14 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
+  tr ' ' "$nl" < "$tmpdepfile" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -503,9 +580,10 @@ makedepend)
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -525,7 +603,7 @@ cpp)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -594,8 +672,8 @@ msvisualcpp)
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
diff --git a/etpo/Makefile.am b/etpo/Makefile.am
index e7fa933..584657f 100644
--- a/etpo/Makefile.am
+++ b/etpo/Makefile.am
@@ -4,7 +4,6 @@ lexer.c: grammar.h
 AM_YFLAGS=-d
 AM_CFLAGS=\
 	@GTK_CFLAGS@ 		 \
-	@GCONF_CFLAGS@		 \
 	@KRB5_CFLAGS@		 \
 	@NETWORK_MANAGER_CFLAGS@ \
 	@LIBNOTIFY_CFLAGS@	 \
@@ -13,7 +12,6 @@ AM_LDFLAGS=\
 	@NETWORK_MANAGER_LIBS@ \
 	@KRB5_LIBS@ \
 	@LIBNOTIFY_LIBS@ \
-	@GCONF_LIBS@ \
 	@GTK_LIBS@
 
 DISTCLEANFILES=lexer.c
diff --git a/etpo/Makefile.in b/etpo/Makefile.in
index b41bc9b..d5ee152 100644
--- a/etpo/Makefile.in
+++ b/etpo/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +69,8 @@ PROGRAMS = $(noinst_PROGRAMS)
 am_etpo_OBJECTS = lexer.$(OBJEXT) grammar.$(OBJEXT)
 etpo_OBJECTS = $(am_etpo_OBJECTS)
 etpo_LDADD = $(LDADD)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -65,39 +82,44 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
 @MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
 LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
-AM_V_LEX = $(am__v_LEX_$(V))
-am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY))
+	$(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
+AM_V_LEX = $(am__v_LEX_@AM_V@)
+am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
 am__v_LEX_0 = @echo "  LEX   " $@;
 YLWRAP = $(top_srcdir)/ylwrap
 @MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
 LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
-AM_V_YACC = $(am__v_YACC_$(V))
-am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
+	$(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
+AM_V_YACC = $(am__v_YACC_@AM_V@)
+am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
 am__v_YACC_0 = @echo "  YACC  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(etpo_SOURCES)
 DIST_SOURCES = $(etpo_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -133,19 +155,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -160,6 +179,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -250,6 +273,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -259,6 +283,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -283,7 +309,6 @@ etpo_SOURCES = lexer.l grammar.y
 AM_YFLAGS = -d
 AM_CFLAGS = \
 	@GTK_CFLAGS@ 		 \
-	@GCONF_CFLAGS@		 \
 	@KRB5_CFLAGS@		 \
 	@NETWORK_MANAGER_CFLAGS@ \
 	@LIBNOTIFY_CFLAGS@	 \
@@ -293,7 +318,6 @@ AM_LDFLAGS = \
 	@NETWORK_MANAGER_LIBS@ \
 	@KRB5_LIBS@ \
 	@LIBNOTIFY_LIBS@ \
-	@GCONF_LIBS@ \
 	@GTK_LIBS@
 
 DISTCLEANFILES = lexer.c
@@ -346,11 +370,9 @@ clean-noinstPROGRAMS:
 	echo " rm -f" $$list; \
 	rm -f $$list
 grammar.h: grammar.c
-	@if test ! -f $@; then \
-	  rm -f grammar.c; \
-	  $(MAKE) $(AM_MAKEFLAGS) grammar.c; \
-	else :; fi
-etpo$(EXEEXT): $(etpo_OBJECTS) $(etpo_DEPENDENCIES) 
+	@if test ! -f $@; then rm -f grammar.c; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) grammar.c; else :; fi
+etpo$(EXEEXT): $(etpo_OBJECTS) $(etpo_DEPENDENCIES) $(EXTRA_etpo_DEPENDENCIES) 
 	@rm -f etpo$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(etpo_OBJECTS) $(etpo_LDADD) $(LIBS)
 
@@ -366,26 +388,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 .l.c:
 	$(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
@@ -495,10 +514,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/etpo/grammar.c b/etpo/grammar.c
index 1b4d2c2..d67ab61 100644
--- a/etpo/grammar.c
+++ b/etpo/grammar.c
@@ -1,10 +1,8 @@
+/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -67,7 +65,7 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 189 of yacc.c  */
+/* Line 268 of yacc.c  */
 #line 1 "grammar.y"
 
 /*
@@ -95,8 +93,8 @@ static const char *table = "unknown";
 extern const char *currentfile;
 
 
-/* Line 189 of yacc.c  */
-#line 100 "grammar.c"
+/* Line 268 of yacc.c  */
+#line 98 "grammar.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -150,7 +148,7 @@ extern const char *currentfile;
 typedef union YYSTYPE
 {
 
-/* Line 214 of yacc.c  */
+/* Line 293 of yacc.c  */
 #line 26 "grammar.y"
 
 	char *sval;
@@ -158,8 +156,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 214 of yacc.c  */
-#line 163 "grammar.c"
+/* Line 293 of yacc.c  */
+#line 161 "grammar.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -170,8 +168,8 @@ typedef union YYSTYPE
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 175 "grammar.c"
+/* Line 343 of yacc.c  */
+#line 173 "grammar.c"
 
 #ifdef short
 # undef short
@@ -221,7 +219,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -274,11 +272,11 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -301,24 +299,24 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -347,23 +345,7 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -383,6 +365,26 @@ union yyalloc
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  11
 /* YYLAST -- Last index in YYTABLE.  */
@@ -498,8 +500,8 @@ static const yytype_uint8 yyr2[] =
        6,     5,     1
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
@@ -530,8 +532,7 @@ static const yytype_int8 yypgoto[] =
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
@@ -539,6 +540,12 @@ static const yytype_uint8 yytable[] =
       13,    19,     1,     2,     3,    14
 };
 
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-9))
+
+#define yytable_value_is_error(yytable_value) \
+  YYID (0)
+
 static const yytype_uint8 yycheck[] =
 {
        0,     9,     9,     3,     4,     5,     7,     4,     7,    10,
@@ -565,9 +572,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL		goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -577,7 +593,6 @@ do								\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
       YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
@@ -619,19 +634,10 @@ while (YYID (0))
 #endif
 
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
+/* This macro is provided for backward compatibility. */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 #endif
 
 
@@ -823,7 +829,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
 
 #if YYERROR_VERBOSE
 
@@ -926,115 +931,142 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  YYSIZE_T yysize1;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = 0;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+       for details.  YYERROR is fine as it does not invoke this
+       function.
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
     {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+                if (! (yysize <= yysize1
+                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  return 2;
+                yysize = yysize1;
+              }
+        }
+    }
 
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
 
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
+  yysize1 = yysize + yystrlen (yyformat);
+  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    return 2;
+  yysize = yysize1;
 
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1067,6 +1099,7 @@ yydestruct (yymsg, yytype, yyvaluep)
     }
 }
 
+
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@@ -1093,10 +1126,9 @@ YYSTYPE yylval;
 int yynerrs;
 
 
-
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1120,8 +1152,6 @@ yyparse ()
 #endif
 #endif
 {
-
-
     int yystate;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
@@ -1276,7 +1306,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1307,8 +1337,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1363,21 +1393,21 @@ yyreduce:
     {
         case 7:
 
-/* Line 1455 of yacc.c  */
+/* Line 1806 of yacc.c  */
 #line 42 "grammar.y"
     { table = (yyvsp[(2) - (2)].sval); }
     break;
 
   case 8:
 
-/* Line 1455 of yacc.c  */
+/* Line 1806 of yacc.c  */
 #line 43 "grammar.y"
     { (yyval.sval) = g_strconcat((yyvsp[(1) - (2)].sval), (yyvsp[(2) - (2)].sval), NULL);}
     break;
 
   case 10:
 
-/* Line 1455 of yacc.c  */
+/* Line 1806 of yacc.c  */
 #line 44 "grammar.y"
     {
 		{
@@ -1397,7 +1427,7 @@ yyreduce:
 
   case 11:
 
-/* Line 1455 of yacc.c  */
+/* Line 1806 of yacc.c  */
 #line 58 "grammar.y"
     {
 	}
@@ -1405,17 +1435,28 @@ yyreduce:
 
   case 12:
 
-/* Line 1455 of yacc.c  */
+/* Line 1806 of yacc.c  */
 #line 60 "grammar.y"
     { table = "unknown"; }
     break;
 
 
 
-/* Line 1455 of yacc.c  */
-#line 1417 "grammar.c"
+/* Line 1806 of yacc.c  */
+#line 1447 "grammar.c"
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -1443,6 +1484,10 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -1450,37 +1495,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -1539,7 +1583,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -1598,8 +1642,13 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
diff --git a/etpo/grammar.h b/etpo/grammar.h
index 130dd20..ec5624f 100644
--- a/etpo/grammar.h
+++ b/etpo/grammar.h
@@ -1,10 +1,8 @@
+/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -66,7 +64,7 @@
 typedef union YYSTYPE
 {
 
-/* Line 1676 of yacc.c  */
+/* Line 2068 of yacc.c  */
 #line 26 "grammar.y"
 
 	char *sval;
@@ -74,8 +72,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 1676 of yacc.c  */
-#line 79 "grammar.h"
+/* Line 2068 of yacc.c  */
+#line 77 "grammar.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 671f871..5aa0048 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -45,14 +62,19 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -86,19 +108,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -113,6 +132,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -203,6 +226,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -212,6 +236,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -329,10 +355,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
index 0da2cf9..726c5b8 100644
--- a/gnome-doc-utils.make
+++ b/gnome-doc-utils.make
@@ -135,7 +135,6 @@ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
 
 _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
 _db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
 _chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
 _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
 _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
@@ -149,6 +148,24 @@ endif
 
 
 ################################################################################
+## Support for automake silent-rules
+GDU_V_XML2PO=$(GDU__v_XML2PO_$(V))
+GDU__v_XML2PO_=$(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY))
+GDU__v_XML2PO_0=@echo "  XML2PO" $@;
+
+GDU_V_MSGFMT=$(GDU__v_MSGFMT_$(V))
+GDU__v_MSGFMT_=$(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+GDU__v_MSGFMT_0=@echo "  MSGFMT" $@;
+
+GDU_V_DB2OMF=$(GDU__v_DB2OMF_$(V))
+GDU__v_DB2OMF_=$(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY))
+GDU__v_DB2OMF_0=@echo "  DB2OMF" $@;
+
+GDU_V_DB2HTM=$(GDU__v_DB2HTM_$(V))
+GDU__v_DB2HTM_=$(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY))
+GDU__v_DB2HTM_0=@echo "  DB2HTM" $@;
+
+################################################################################
 ## @@ Rules for OMF Files
 
 db2omf_args =									\
@@ -180,7 +197,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
 	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
 	  echo "Please check your ScrollKeeper installation." >&2;		\
 	  exit 1; }
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
+	$(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
 
 ## @ _DOC_OMF_HTML
 ## The OMF files for HTML output
@@ -195,7 +212,7 @@ if ENABLE_SK
 	  echo "Please check your ScrollKeeper installation." >&2;		\
 	  exit 1; }
 endif
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
+	$(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
 
 ## @ _DOC_OMF_ALL
 ## All OMF output files to be built
@@ -340,18 +357,15 @@ $(_DOC_POFILES):
 	fi
 
 $(_DOC_MOFILES): %.mo: %.po
-	@if ! test -d $(dir $@); then \
-	  echo "mkdir $(dir $@)"; \
-	  mkdir "$(dir $@)"; \
-	fi
-	msgfmt -o $@ $<
+	$(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi
+	$(GDU_V_MSGFMT)msgfmt -o $@ $<
 
 # FIXME: fix the dependancy
 # FIXME: hook xml2po up
 $(_DOC_LC_DOCS) : $(_DOC_MOFILES)
 $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
-	if ! test -d $(dir $@); then mkdir $(dir $@); fi
-	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+	$(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi
+	$(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
 	mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
 	if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
 	(cd $(dir $@) && \
@@ -365,7 +379,7 @@ _DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot))
 .PHONY: pot
 pot: $(_DOC_POT)
 $(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-	$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
+	$(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
 
 
 ################################################################################
@@ -379,7 +393,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
 _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
 
 $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
+	$(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
 
 
 ################################################################################
@@ -459,7 +473,29 @@ dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
 	  echo " $(mkinstalldirs) $(distdir)/$$lc"; \
 	  $(mkinstalldirs) "$(distdir)/$$lc"; \
 	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
+	@list='$(_DOC_C_DOCS)'; \
+	for doc in $$list; do \
+	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
+	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+	    if ! test -d "$(distdir)/$$docdir"; then \
+	      echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
+	      $(mkinstalldirs) "$(distdir)/$$docdir"; \
+	    fi; \
+	  echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
+	  $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
+	done
+	@list='$(_DOC_LC_DOCS)'; \
+	for doc in $$list; do \
+	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
+	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+	    if ! test -d "$(distdir)/$$docdir"; then \
+	      echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
+	      $(mkinstalldirs) "$(distdir)/$$docdir"; \
+	    fi; \
+	  echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
+	  $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
+	done
+	@list='$(_DOC_POFILES)'; \
 	for doc in $$list; do \
 	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
 	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
@@ -530,8 +566,8 @@ check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
 	    xmlpath="$$lc:$(srcdir)/$$lc"; \
 	  fi; \
 	  for page in $(DOC_PAGES); do \
-	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
+	    echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
+	    xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
 	  done; \
 	done
 
@@ -562,7 +598,18 @@ install-doc-docs:
 	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
 	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
 	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
+	@list='$(_DOC_C_DOCS)'; for doc in $$list; do \
+	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
+	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
+	  if ! test -d "$$docdir"; then \
+	    echo "$(mkinstalldirs) $$docdir"; \
+	    $(mkinstalldirs) "$$docdir"; \
+	  fi; \
+	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
+	done
+	@list='$(_DOC_LC_DOCS)'; for doc in $$list; do \
 	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
 	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
 	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
@@ -633,7 +680,11 @@ uninstall-local:					\
 #	$(if $(_DOC_DSK_IN),uninstall-doc-dsk)
 
 uninstall-doc-docs:
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
+	@list='$(_DOC_C_DOCS)'; for doc in $$list; do \
+	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	done
+	@list='$(_DOC_LC_DOCS)'; for doc in $$list; do \
 	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
 	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
 	done
diff --git a/help/Makefile.in b/help/Makefile.in
index 1d3034d..8c69053 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -39,6 +39,23 @@
 
 ################################################################################
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -70,14 +87,19 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -111,19 +133,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -138,6 +157,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -228,6 +251,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -237,6 +261,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -269,6 +295,20 @@ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
 @ENABLE_SK_TRUE@_ENABLE_SK = true
 
 ################################################################################
+GDU_V_XML2PO = $(GDU__v_XML2PO_$(V))
+GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY))
+GDU__v_XML2PO_0 = @echo "  XML2PO" $@;
+GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V))
+GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+GDU__v_MSGFMT_0 = @echo "  MSGFMT" $@;
+GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V))
+GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY))
+GDU__v_DB2OMF_0 = @echo "  DB2OMF" $@;
+GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V))
+GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY))
+GDU__v_DB2HTM_0 = @echo "  DB2HTM" $@;
+
+################################################################################
 db2omf_args = \
 	--stringparam db2omf.basename $(DOC_MODULE)				\
 	--stringparam db2omf.format $(3)					\
@@ -407,6 +447,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/gnome-doc-utils.make:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -476,10 +517,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -653,7 +699,6 @@ _xml2po ?= `which xml2po`
 
 _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
 _db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
 _chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
 _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
 _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
@@ -667,7 +712,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
 	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
 	  echo "Please check your ScrollKeeper installation." >&2;		\
 	  exit 1; }
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
+	$(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
 
 $(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
 $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
@@ -675,7 +720,7 @@ $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
 @ENABLE_SK_TRUE@	  echo "The file '$(_skcontentslist)' does not exist" >&2;		\
 @ENABLE_SK_TRUE@	  echo "Please check your ScrollKeeper installation." >&2;		\
 @ENABLE_SK_TRUE@	  exit 1; }
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
+	$(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
 
 .PHONY: omf
 omf: $(_DOC_OMF_ALL)
@@ -714,18 +759,15 @@ $(_DOC_POFILES):
 	fi
 
 $(_DOC_MOFILES): %.mo: %.po
-	@if ! test -d $(dir $@); then \
-	  echo "mkdir $(dir $@)"; \
-	  mkdir "$(dir $@)"; \
-	fi
-	msgfmt -o $@ $<
+	$(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi
+	$(GDU_V_MSGFMT)msgfmt -o $@ $<
 
 # FIXME: fix the dependancy
 # FIXME: hook xml2po up
 $(_DOC_LC_DOCS) : $(_DOC_MOFILES)
 $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
-	if ! test -d $(dir $@); then mkdir $(dir $@); fi
-	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+	$(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi
+	$(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
 	mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
 	if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
 	(cd $(dir $@) && \
@@ -735,10 +777,10 @@ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
 .PHONY: pot
 pot: $(_DOC_POT)
 $(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-	$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
+	$(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
 
 $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
+	$(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
 
 ################################################################################
 
@@ -806,7 +848,29 @@ dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
 	  echo " $(mkinstalldirs) $(distdir)/$$lc"; \
 	  $(mkinstalldirs) "$(distdir)/$$lc"; \
 	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
+	@list='$(_DOC_C_DOCS)'; \
+	for doc in $$list; do \
+	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
+	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+	    if ! test -d "$(distdir)/$$docdir"; then \
+	      echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
+	      $(mkinstalldirs) "$(distdir)/$$docdir"; \
+	    fi; \
+	  echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
+	  $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
+	done
+	@list='$(_DOC_LC_DOCS)'; \
+	for doc in $$list; do \
+	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
+	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+	    if ! test -d "$(distdir)/$$docdir"; then \
+	      echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
+	      $(mkinstalldirs) "$(distdir)/$$docdir"; \
+	    fi; \
+	  echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
+	  $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
+	done
+	@list='$(_DOC_POFILES)'; \
 	for doc in $$list; do \
 	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
 	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
@@ -874,8 +938,8 @@ check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
 	    xmlpath="$$lc:$(srcdir)/$$lc"; \
 	  fi; \
 	  for page in $(DOC_PAGES); do \
-	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
+	    echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
+	    xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
 	  done; \
 	done
 
@@ -901,7 +965,18 @@ install-doc-docs:
 	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
 	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
 	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
+	@list='$(_DOC_C_DOCS)'; for doc in $$list; do \
+	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
+	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
+	  if ! test -d "$$docdir"; then \
+	    echo "$(mkinstalldirs) $$docdir"; \
+	    $(mkinstalldirs) "$$docdir"; \
+	  fi; \
+	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
+	done
+	@list='$(_DOC_LC_DOCS)'; for doc in $$list; do \
 	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
 	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
 	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
@@ -969,7 +1044,11 @@ uninstall-local:					\
 #	$(if $(_DOC_DSK_IN),uninstall-doc-dsk)
 
 uninstall-doc-docs:
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
+	@list='$(_DOC_C_DOCS)'; for doc in $$list; do \
+	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
+	done
+	@list='$(_DOC_LC_DOCS)'; for doc in $$list; do \
 	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
 	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
 	done
diff --git a/help/de/de.po b/help/de/de.po
index f00c35e..5de0dde 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2010-09-12 12:02+0000\n"
-"PO-Revision-Date: 2010-09-20 22:34+0100\n"
-"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
+"POT-Creation-Date: 2012-03-23 23:12+0000\n"
+"PO-Revision-Date: 2012-05-13 21:40+0100\n"
+"Last-Translator: Daniel Winzen <d@winzen4.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -307,17 +307,15 @@ msgstr "Befehlszeile"
 
 #: C/krb5-auth-dialog.xml:155(para)
 msgid ""
-"Type <command>krb5-auth-dialog --always</command>, then press "
-"<keycap>Return</keycap>:"
+"Type <command>krb5-auth-dialog</command>, then press <keycap>Return</keycap>:"
 msgstr ""
-"Geben Sie <command>krb5-auth-dialog --always</command> ein und drücken Sie "
+"Geben Sie <command>krb5-auth-dialog</command> ein und drücken Sie "
 "anschließend die <keycap>Eingabetaste</keycap>:"
 
 #: C/krb5-auth-dialog.xml:162(para)
-msgid "The tray icon will indicate one of tree states:"
+msgid "The tray icon will indicate one of three states:"
 msgstr ""
-"Das Symbol im Benachrichtigungsfeld zeigt einen der folgenden drei Zustände "
-"an:"
+"Das Benachrichtigungssymbol zeigt einen der folgenden drei Zustände an:"
 
 #: C/krb5-auth-dialog.xml:167(title) C/krb5-auth-dialog.xml:170(title)
 msgid "Valid Kerberos ticket"
diff --git a/help/de/krb5-auth-dialog.xml b/help/de/krb5-auth-dialog.xml
index 98d99d2..172d1b5 100644
--- a/help/de/krb5-auth-dialog.xml
+++ b/help/de/krb5-auth-dialog.xml
@@ -144,16 +144,11 @@
     <varlistentry>
       <term>Befehlszeile</term>
       <listitem>
-	<para>
-	  Type <command>krb5-auth-dialog</command>,
-          then press <keycap>Return</keycap>:
-        </para>
+	<para>Geben Sie <command>krb5-auth-dialog</command> ein und drücken Sie anschließend die <keycap>Eingabetaste</keycap>:</para>
       </listitem>
     </varlistentry>
   </variablelist>
-  <para>
-    The tray icon will indicate one of three states:
-  </para>
+  <para>Das Benachrichtigungssymbol zeigt einen der folgenden drei Zustände an:</para>
 
   <section id="trayicon-valid">
     <title>Gültiges Kerberos-Ticket</title>
diff --git a/icons/22x22/Makefile.in b/icons/22x22/Makefile.in
index d46bf64..53419eb 100644
--- a/icons/22x22/Makefile.in
+++ b/icons/22x22/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -46,14 +63,19 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +97,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(icondir)"
 DATA = $(icon_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -110,19 +138,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -137,6 +162,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -227,6 +256,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -236,6 +266,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -306,8 +338,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-iconDATA: $(icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
 	@list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -321,9 +356,7 @@ uninstall-iconDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(icondir)" && rm -f $$files
+	dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -378,10 +411,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in
index 5233358..b638143 100644
--- a/icons/48x48/Makefile.in
+++ b/icons/48x48/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -46,14 +63,19 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +97,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(icondir)"
 DATA = $(icon_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -110,19 +138,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -137,6 +162,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -227,6 +256,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -236,6 +266,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -306,8 +338,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-iconDATA: $(icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
 	@list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -321,9 +356,7 @@ uninstall-iconDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(icondir)" && rm -f $$files
+	dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -378,10 +411,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/icons/Makefile.in b/icons/Makefile.in
index 76fd4de..3e3a725 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -45,11 +62,11 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -60,6 +77,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -126,19 +148,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -153,6 +172,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -243,6 +266,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -252,6 +276,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -481,13 +507,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -522,10 +545,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in
index 53612fa..243e4f3 100644
--- a/icons/scalable/Makefile.in
+++ b/icons/scalable/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -46,14 +63,19 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +97,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(icondir)"
 DATA = $(icon_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -110,19 +138,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -137,6 +162,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -227,6 +256,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -236,6 +266,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -306,8 +338,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-iconDATA: $(icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
 	@list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -321,9 +356,7 @@ uninstall-iconDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(icondir)" && rm -f $$files
+	dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -378,10 +411,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/install-sh b/install-sh
index 6781b98..a9244eb 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@ do
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@ do
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec
index e8c45f6..57f6778 100644
--- a/krb5-auth-dialog.spec
+++ b/krb5-auth-dialog.spec
@@ -1,6 +1,6 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
-Version: 3.2.1
+Version: 3.8.0
 Release: 1
 License: GPL
 Group: User Interface/X
diff --git a/ltmain.sh b/ltmain.sh
index c7bf234..33f642a 100755..100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4 Debian-2.4-4
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4 Debian-2.4-4"
+VERSION="2.4.2 Debian-2.4.2-1.1"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@ case $progpath in
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@ opt_finish=false
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@ esac
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@ func_mode_compile ()
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@ func_exec_program_core ()
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@ func_mode_link ()
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6150,7 +6163,8 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6834,7 +6848,7 @@ func_mode_link ()
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7319,6 +7333,7 @@ func_mode_link ()
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7438,7 +7453,7 @@ func_mode_link ()
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8026,6 +8041,11 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8056,7 +8076,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8064,11 +8084,7 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9158,6 +9174,8 @@ EOF
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9267,7 +9285,8 @@ EOF
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff --git a/missing b/missing
index 28055d2..86a8fc3 100755
--- a/missing
+++ b/missing
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@ Supported PROGRAM values:
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@ case $1 in
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@ WARNING: \`$1' $msg.  You should only need it if
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@ WARNING: \`$1' is $msg.  You should only need it if
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.
diff --git a/plugins/Makefile.in b/plugins/Makefile.in
index 39b1cce..949600c 100644
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -66,6 +83,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pkglibdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libka_plugin_afs_la_LIBADD =
@@ -73,8 +96,8 @@ am__objects_1 =
 am_libka_plugin_afs_la_OBJECTS = libka_plugin_afs_la-ka-plugin-afs.lo \
 	$(am__objects_1)
 libka_plugin_afs_la_OBJECTS = $(am_libka_plugin_afs_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 libka_plugin_afs_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -110,21 +133,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libka_plugin_afs_la_SOURCES) \
 	$(libka_plugin_dummy_la_SOURCES) \
@@ -132,6 +155,11 @@ SOURCES = $(libka_plugin_afs_la_SOURCES) \
 DIST_SOURCES = $(libka_plugin_afs_la_SOURCES) \
 	$(libka_plugin_dummy_la_SOURCES) \
 	$(am__libka_plugin_pam_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -168,19 +196,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -195,6 +220,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -285,6 +314,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -294,6 +324,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -411,7 +443,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -419,6 +450,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 	}
@@ -440,11 +473,11 @@ clean-pkglibLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libka-plugin-afs.la: $(libka_plugin_afs_la_OBJECTS) $(libka_plugin_afs_la_DEPENDENCIES) 
+libka-plugin-afs.la: $(libka_plugin_afs_la_OBJECTS) $(libka_plugin_afs_la_DEPENDENCIES) $(EXTRA_libka_plugin_afs_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libka_plugin_afs_la_LINK) -rpath $(pkglibdir) $(libka_plugin_afs_la_OBJECTS) $(libka_plugin_afs_la_LIBADD) $(LIBS)
-libka-plugin-dummy.la: $(libka_plugin_dummy_la_OBJECTS) $(libka_plugin_dummy_la_DEPENDENCIES) 
+libka-plugin-dummy.la: $(libka_plugin_dummy_la_OBJECTS) $(libka_plugin_dummy_la_DEPENDENCIES) $(EXTRA_libka_plugin_dummy_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libka_plugin_dummy_la_LINK) -rpath $(pkglibdir) $(libka_plugin_dummy_la_OBJECTS) $(libka_plugin_dummy_la_LIBADD) $(LIBS)
-libka-plugin-pam.la: $(libka_plugin_pam_la_OBJECTS) $(libka_plugin_pam_la_DEPENDENCIES) 
+libka-plugin-pam.la: $(libka_plugin_pam_la_OBJECTS) $(libka_plugin_pam_la_DEPENDENCIES) $(EXTRA_libka_plugin_pam_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libka_plugin_pam_la_LINK) $(am_libka_plugin_pam_la_rpath) $(libka_plugin_pam_la_OBJECTS) $(libka_plugin_pam_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -460,50 +493,44 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libka_plugin_afs_la-ka-plugin-afs.lo: ka-plugin-afs.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_afs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libka_plugin_afs_la-ka-plugin-afs.lo -MD -MP -MF $(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Tpo -c -o libka_plugin_afs_la-ka-plugin-afs.lo `test -f 'ka-plugin-afs.c' || echo '$(srcdir)/'`ka-plugin-afs.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Tpo $(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin-afs.c' object='libka_plugin_afs_la-ka-plugin-afs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin-afs.c' object='libka_plugin_afs_la-ka-plugin-afs.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_afs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libka_plugin_afs_la-ka-plugin-afs.lo `test -f 'ka-plugin-afs.c' || echo '$(srcdir)/'`ka-plugin-afs.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_afs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libka_plugin_afs_la-ka-plugin-afs.lo `test -f 'ka-plugin-afs.c' || echo '$(srcdir)/'`ka-plugin-afs.c
 
 libka_plugin_dummy_la-ka-plugin-dummy.lo: ka-plugin-dummy.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_dummy_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libka_plugin_dummy_la-ka-plugin-dummy.lo -MD -MP -MF $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Tpo -c -o libka_plugin_dummy_la-ka-plugin-dummy.lo `test -f 'ka-plugin-dummy.c' || echo '$(srcdir)/'`ka-plugin-dummy.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Tpo $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin-dummy.c' object='libka_plugin_dummy_la-ka-plugin-dummy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin-dummy.c' object='libka_plugin_dummy_la-ka-plugin-dummy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_dummy_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libka_plugin_dummy_la-ka-plugin-dummy.lo `test -f 'ka-plugin-dummy.c' || echo '$(srcdir)/'`ka-plugin-dummy.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_dummy_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libka_plugin_dummy_la-ka-plugin-dummy.lo `test -f 'ka-plugin-dummy.c' || echo '$(srcdir)/'`ka-plugin-dummy.c
 
 libka_plugin_pam_la-ka-plugin-pam.lo: ka-plugin-pam.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_pam_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libka_plugin_pam_la-ka-plugin-pam.lo -MD -MP -MF $(DEPDIR)/libka_plugin_pam_la-ka-plugin-pam.Tpo -c -o libka_plugin_pam_la-ka-plugin-pam.lo `test -f 'ka-plugin-pam.c' || echo '$(srcdir)/'`ka-plugin-pam.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libka_plugin_pam_la-ka-plugin-pam.Tpo $(DEPDIR)/libka_plugin_pam_la-ka-plugin-pam.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin-pam.c' object='libka_plugin_pam_la-ka-plugin-pam.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin-pam.c' object='libka_plugin_pam_la-ka-plugin-pam.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_pam_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libka_plugin_pam_la-ka-plugin-pam.lo `test -f 'ka-plugin-pam.c' || echo '$(srcdir)/'`ka-plugin-pam.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_pam_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libka_plugin_pam_la-ka-plugin-pam.lo `test -f 'ka-plugin-pam.c' || echo '$(srcdir)/'`ka-plugin-pam.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -610,10 +637,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index cc8a222..06a8cfe 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -49,8 +49,8 @@ MSGFMT = @MSGFMT@
 XGETTEXT = @XGETTEXT@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
@@ -73,15 +73,20 @@ CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$l
 .SUFFIXES:
 .SUFFIXES: .po .pox .gmo .mo .msg .cat
 
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
+
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
-	$(MSGFMT) -o $@ $<
+	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
+	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7485558..b65ce3d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,5 +7,5 @@ src/ka-tools.c
 src/ka-main-window.c
 src/ka-preferences.c
 src/krb5-auth-dialog.desktop.in
-src/krb5-auth-dialog.schemas.in
+src/org.gnome.KrbAuthDialog.gschema.xml
 secmem/util.c
diff --git a/po/cs.po b/po/cs.po
index f55611f..10fdfc1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,163 +9,165 @@ msgstr ""
 "Project-Id-Version: krb5-auth-dialog master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-"
 "auth-dialog&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-09 10:02+0000\n"
+"POT-Creation-Date: 2012-10-02 20:29+0000\n"
 "PO-Revision-Date: 2011-09-05 08:42+0100\n"
 "Last-Translator: Zdeněk Hataš <zdenek.hatas@gmail.com>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../src/krb5-auth-dialog.ui.h:1
-msgid "Certificate and private key used for authentication"
-msgstr "Certifikát a soukromý klíč použitý k autentizaci"
+#.
+#. * vim:ts:sts=4:sw=4:et:
+#.
+#: ../src/krb5-auth-dialog.ui.h:1 ../src/krb5-auth-dialog.desktop.in.h:1
+msgid "Kerberos Authentication"
+msgstr "Autentizace Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:2
-msgid "Certificate used to verify digital signatures."
-msgstr "Certifikát použitý pro ověření digitálních podpisů."
+msgid "_Renew Ticket"
+msgstr "_Obnovit lístek"
 
 #: ../src/krb5-auth-dialog.ui.h:3
-msgid ""
-"Configure the use of certificates and smartcards for your Kerberos network "
-"authentication."
-msgstr ""
-"Nastavit použití certifikátů a čipových karet při síťové autentizaci "
-"Kerberos."
+msgid "Service Tickets"
+msgstr "Lístky služeb"
 
 #: ../src/krb5-auth-dialog.ui.h:4
-msgid "If checked, request forwardable tickets"
-msgstr ""
+msgid "_File"
+msgstr "_Soubor"
 
 #: ../src/krb5-auth-dialog.ui.h:5
-msgid "If checked, request proxiable tickets"
-msgstr ""
+msgid "_Edit"
+msgstr "Ú_pravy"
 
 #: ../src/krb5-auth-dialog.ui.h:6
-msgid "If checked, request renewable tickets"
-msgstr "Pokud je zaškrtnuto, požadovat obnovitelné lístky"
+msgid "_Help"
+msgstr "Nápo_věda"
 
 #: ../src/krb5-auth-dialog.ui.h:7
-msgid "If checked, use a security token (Smartcard) to authenticate."
-msgstr ""
+msgid "Kerberos User"
+msgstr "Uživatel"
 
 #: ../src/krb5-auth-dialog.ui.h:8
-msgid "Kerberos"
-msgstr "Kerberos"
+msgid ""
+"The name of your Kerberos account. Leave blank to use your current username."
+msgstr ""
+"Název vašeho účtu Kerberos. Ponechte prázdné, pokud chcete použít aktuální "
+"uživatelské jméno."
 
-#.
-#. * vim:ts:sts=4:sw=4:et:
-#.
-#: ../src/krb5-auth-dialog.ui.h:9 ../src/krb5-auth-dialog.desktop.in.h:1
-msgid "Kerberos Authentication"
-msgstr "Autentizace Kerberos"
+#: ../src/krb5-auth-dialog.ui.h:9
+msgid "Kerberos principal:"
+msgstr "Principal:"
 
 #: ../src/krb5-auth-dialog.ui.h:10
 msgid "Kerberos Ticket Options"
 msgstr "Vlastnosti lístku Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:11
-msgid "Kerberos User"
-msgstr "Uživatel"
+msgid "Requested Kerberos tickets should be:"
+msgstr "Požadované lístky Kerberos mohou být:"
 
 #: ../src/krb5-auth-dialog.ui.h:12
-msgid "Kerberos principal:"
-msgstr "Principal:"
+msgid "forwardable"
+msgstr "přenositelné"
 
 #: ../src/krb5-auth-dialog.ui.h:13
-msgid "Notifications"
-msgstr "Upozornění"
+msgid "If checked, request forwardable tickets"
+msgstr "Je-li zaškrtnuto, požadovat přenositelné (forwardable) lístky"
 
 #: ../src/krb5-auth-dialog.ui.h:14
-msgid "PKINIT"
-msgstr "PKINIT"
+msgid "renewable"
+msgstr "obnovitelné"
 
 #: ../src/krb5-auth-dialog.ui.h:15
-msgid "Requested Kerberos tickets should be:"
-msgstr "Požadované lístky Kerberos mohou být:"
+msgid "If checked, request renewable tickets"
+msgstr "Je-li zaškrtnuto, požadovat obnovitelné (renewable) lístky"
 
 #: ../src/krb5-auth-dialog.ui.h:16
-msgid ""
-"Send notification about ticket expiry that many minutes before it finally "
-"expires"
-msgstr ""
+msgid "proxiable"
+msgstr "delegovatelné"
 
 #: ../src/krb5-auth-dialog.ui.h:17
-msgid "Service Tickets"
-msgstr "Lístky služeb"
+msgid "If checked, request proxiable tickets"
+msgstr "Je-li zaškrtnuto, požadovat delegovatelné (proxiable) lístky"
 
 #: ../src/krb5-auth-dialog.ui.h:18
-msgid ""
-"The name of your Kerberos account. Leave blank to use your current username."
-msgstr ""
-"Název vašeho účtu Kerberos. Ponechte prázdné, pokud chcete použít aktuální "
-"uživatelské jméno."
+msgid "Kerberos"
+msgstr "Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:19
+msgid "Userid"
+msgstr "Id uživatele"
+
+#: ../src/krb5-auth-dialog.ui.h:20
 msgid "Use Smartcard"
 msgstr "Použít čipovou kartu"
 
-#: ../src/krb5-auth-dialog.ui.h:20
-msgid "Userid"
-msgstr "Id uživatele"
+#: ../src/krb5-auth-dialog.ui.h:21
+msgid "If checked, use a security token (Smartcard) to authenticate."
+msgstr "Je-li zaškrtnuto, používat k ověřování bezpečnostní token (čipovou kartu)."
 
-#. Used in combination: 'Warn x minutes before expiry'
 #: ../src/krb5-auth-dialog.ui.h:22
-msgid "Warn"
-msgstr "Upozornit"
+msgid "Certificate and private key used for authentication"
+msgstr "Certifikát a soukromý klíč použitý k autentizaci"
 
 #: ../src/krb5-auth-dialog.ui.h:23
-msgid "X509 trust anchors"
-msgstr ""
-
-#: ../src/krb5-auth-dialog.ui.h:24
 msgid "_Browse..."
 msgstr "_Procházet..."
 
+#: ../src/krb5-auth-dialog.ui.h:24
+msgid "X509 trust anchors"
+msgstr ""
+
 #: ../src/krb5-auth-dialog.ui.h:25
-msgid "_Edit"
-msgstr "Ú_pravy"
+msgid "Certificate used to verify digital signatures."
+msgstr "Certifikát použitý pro ověření digitálních podpisů."
 
 #: ../src/krb5-auth-dialog.ui.h:26
-msgid "_File"
-msgstr "_Soubor"
+msgid ""
+"Configure the use of certificates and smartcards for your Kerberos network "
+"authentication."
+msgstr ""
+"Nastavit použití certifikátů a čipových karet při síťové autentizaci "
+"Kerberos."
 
 #: ../src/krb5-auth-dialog.ui.h:27
-msgid "_Help"
-msgstr "Nápo_věda"
+msgid "PKINIT"
+msgstr "PKINIT"
 
 #: ../src/krb5-auth-dialog.ui.h:28
-msgid "_Renew Ticket"
-msgstr "_Obnovit lístek"
-
-#: ../src/krb5-auth-dialog.ui.h:29
-msgid "forwardable"
-msgstr ""
+msgid "Notifications"
+msgstr "Upozornění"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../src/krb5-auth-dialog.ui.h:31
-msgid "minutes before ticket expiry"
-msgstr "minut do vypršení lístku"
+#: ../src/krb5-auth-dialog.ui.h:30
+msgid "Warn"
+msgstr "Upozornit"
 
-#: ../src/krb5-auth-dialog.ui.h:32
-msgid "proxiable"
+#: ../src/krb5-auth-dialog.ui.h:31
+msgid ""
+"Send notification about ticket expiry that many minutes before it finally "
+"expires"
 msgstr ""
+"Posílat oznámení o vypršení platnosti lístku tento počet minut před končeným "
+"vypršením"
 
+#. Used in combination: 'Warn x minutes before expiry'
 #: ../src/krb5-auth-dialog.ui.h:33
-msgid "renewable"
-msgstr ""
+msgid "minutes before ticket expiry"
+msgstr "minut do vypršení lístku"
 
-#: ../src/ka-dialog.c:177
+#: ../src/ka-kerberos.c:177
 msgid "unknown error"
 msgstr "neznámá chyba"
 
-#: ../src/ka-dialog.c:317
+#: ../src/ka-kerberos.c:317
 msgid "Your ticket cache is currently empty"
 msgstr "Mezipaměť vašich přihlašovacích údajů je prázdná"
 
-#: ../src/ka-dialog.c:343
+#: ../src/ka-kerberos.c:341
 msgid "Expired"
 msgstr "Platnost vypršela"
 
@@ -174,26 +176,26 @@ msgstr "Platnost vypršela"
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr "Nelze získat lístek: '%s'"
 
-#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:368
+#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:466
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
-msgstr[0] "Vaše přihlašovací údaje vyprší za %d minutu"
-msgstr[1] "Vaše přihlašovací údaje vyprší za %d minuty"
-msgstr[2] "Vaše přihlašovací údaje vyprší za %d minut"
+msgstr[0] "Vaše pověření údaje vyprší za %d minutu"
+msgstr[1] "Vaše pověření vyprší za %d minuty"
+msgstr[2] "Vaše pověření vyprší za %d minut"
 
-#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:373
+#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:471
 msgid "Your credentials have expired"
-msgstr "Vaše přihlašovací údaje vypršely"
+msgstr "Vaše pověření vypršelo"
 
 #: ../src/ka-pwdialog.c:245
 msgid "Please enter your Kerberos password:"
-msgstr "Vložte prosím své Kerberos heslo:"
+msgstr "Vložte prosím své heslo Kerberos:"
 
 #: ../src/ka-pwdialog.c:258
 #, c-format
 msgid "Please enter the password for '%s':"
-msgstr "Vložte prosím své heslo pro '%s':"
+msgstr "Vložte prosím své heslo pro „%s“:"
 
 #: ../src/ka-pwdialog.c:276
 msgid "The password you entered is invalid"
@@ -325,7 +327,7 @@ msgstr "Klient nebo server mají prázdný klíč"
 #. krb5_err.et:krb5:KRB5KDC_ERR_NULL_KEY
 #: ../src/dummy-strings.c:33
 msgid "Ticket is ineligible for postdating"
-msgstr ""
+msgstr "Lístek není použitelný pro odloženou platnost"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CANNOT_POSTDATE
 #: ../src/dummy-strings.c:34
@@ -365,12 +367,12 @@ msgstr "KDC nemá podporu pro datový typ transited"
 #. krb5_err.et:krb5:KRB5KDC_ERR_TRTYPE_NOSUPP
 #: ../src/dummy-strings.c:41
 msgid "Clients credentials have been revoked"
-msgstr "Přihlašovací údaje klienta byly zneplatněny"
+msgstr "Pověření klienta bylo odvoláno"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_REVOKED
 #: ../src/dummy-strings.c:42
 msgid "Credentials for server have been revoked"
-msgstr "Přihlašovací údaje severu byly zneplatněny"
+msgstr "Pověření severu bylo odvoláno"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_REVOKED
 #: ../src/dummy-strings.c:43
@@ -475,7 +477,7 @@ msgstr "Zpráva mimo pořadí"
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADORDER
 #: ../src/dummy-strings.c:63
 msgid "Illegal cross-realm ticket"
-msgstr ""
+msgstr "Neplatný lístek napříč sférami"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_ILL_CR_TKT
 #: ../src/dummy-strings.c:64
@@ -651,7 +653,7 @@ msgstr "Neplatný znak v názvu komponenty"
 #. krb5_err.et:krb5:KRB5_PARSE_ILLCHAR
 #: ../src/dummy-strings.c:98
 msgid "Malformed representation of principal"
-msgstr ""
+msgstr "Poškozená reprezentace principalu"
 
 #. krb5_err.et:krb5:KRB5_PARSE_MALFORMED
 #: ../src/dummy-strings.c:99
@@ -671,32 +673,32 @@ msgstr "Nedostatek místa pro vrácení úplné informace"
 #. krb5_err.et:krb5:KRB5_CONFIG_NOTENUFSPACE
 #: ../src/dummy-strings.c:102
 msgid "Invalid message type specified for encoding"
-msgstr ""
+msgstr "Neplatný typ zprávy určené pro kódování"
 
 #. krb5_err.et:krb5:KRB5_BADMSGTYPE
 #: ../src/dummy-strings.c:103
 msgid "Credential cache name malformed"
-msgstr ""
+msgstr "Chybný název mezipaměti s pověřeními"
 
 #. krb5_err.et:krb5:KRB5_CC_BADNAME
 #: ../src/dummy-strings.c:104
 msgid "Unknown credential cache type"
-msgstr ""
+msgstr "Neznámý typ mezipaměti s pověřeními"
 
 #. krb5_err.et:krb5:KRB5_CC_UNKNOWN_TYPE
 #: ../src/dummy-strings.c:105
 msgid "Matching credential not found"
-msgstr ""
+msgstr "Odopvídající pověření nebylo nalezeno"
 
 #. krb5_err.et:krb5:KRB5_CC_NOTFOUND
 #: ../src/dummy-strings.c:106
 msgid "End of credential cache reached"
-msgstr ""
+msgstr "Dosažen konec mezipaměti s pověřeními"
 
 #. krb5_err.et:krb5:KRB5_CC_END
 #: ../src/dummy-strings.c:107
 msgid "Request did not supply a ticket"
-msgstr ""
+msgstr "Žádost neposkytla lístek"
 
 #. krb5_err.et:krb5:KRB5_NO_TKT_SUPPLIED
 #: ../src/dummy-strings.c:108
@@ -721,22 +723,22 @@ msgstr "Odpověď KDC nesplnila očekávání"
 #. krb5_err.et:krb5:KRB5_KDCREP_MODIFIED
 #: ../src/dummy-strings.c:112
 msgid "Clock skew too great in KDC reply"
-msgstr ""
+msgstr "Zkreslení hodin v odpovědi KDC je příliš velké"
 
 #. krb5_err.et:krb5:KRB5_KDCREP_SKEW
 #: ../src/dummy-strings.c:113
 msgid "Client/server realm mismatch in initial ticket request"
-msgstr ""
+msgstr "Nesouhlasí sféry klienta/serveru požadavku na počáteční tiket"
 
 #. krb5_err.et:krb5:KRB5_IN_TKT_REALM_MISMATCH
 #: ../src/dummy-strings.c:114
 msgid "Program lacks support for encryption type"
-msgstr ""
+msgstr "Program postrádá podporu pro typ šifrování"
 
 #. krb5_err.et:krb5:KRB5_PROG_ETYPE_NOSUPP
 #: ../src/dummy-strings.c:115
 msgid "Program lacks support for key type"
-msgstr ""
+msgstr "Program postrádá podporu pro typ klíče"
 
 #. krb5_err.et:krb5:KRB5_PROG_KEYTYPE_NOSUPP
 #: ../src/dummy-strings.c:116
@@ -746,12 +748,12 @@ msgstr "Ve zprávě nebyl použit požadovaný typ šifrování"
 #. krb5_err.et:krb5:KRB5_WRONG_ETYPE
 #: ../src/dummy-strings.c:117
 msgid "Program lacks support for checksum type"
-msgstr ""
+msgstr "Program postrádá podporu pro typ kontrolního součtu"
 
 #. krb5_err.et:krb5:KRB5_PROG_SUMTYPE_NOSUPP
 #: ../src/dummy-strings.c:118
 msgid "Cannot find KDC for requested realm"
-msgstr "Nelze nalézt KDC pro požadovanou doménu"
+msgstr "Nelze nalézt KDC pro požadovanou sféru"
 
 #. krb5_err.et:krb5:KRB5_REALM_UNKNOWN
 #: ../src/dummy-strings.c:119
@@ -761,17 +763,17 @@ msgstr "Neznámá služba Kerberos"
 #. krb5_err.et:krb5:KRB5_SERVICE_UNKNOWN
 #: ../src/dummy-strings.c:120
 msgid "Cannot contact any KDC for requested realm"
-msgstr "Pro požadovaný realm nelze kontaktovat žádný KDC"
+msgstr "Pro požadovanou sféru nelze kontaktovat žádný KDC"
 
 #. krb5_err.et:krb5:KRB5_KDC_UNREACH
 #: ../src/dummy-strings.c:121
 msgid "No local name found for principal name"
-msgstr ""
+msgstr "Nenalezen místní název pro název principalu"
 
 #. krb5_err.et:krb5:KRB5_MUTUAL_FAILED
 #: ../src/dummy-strings.c:123
 msgid "Replay cache type is already registered"
-msgstr ""
+msgstr "Typ mezipaměti odpovědí je již zaregistrován"
 
 #. krb5_err.et:krb5:KRB5_RC_TYPE_EXISTS
 #: ../src/dummy-strings.c:124
@@ -781,7 +783,7 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_RC_MALLOC
 #: ../src/dummy-strings.c:125
 msgid "Replay cache type is unknown"
-msgstr ""
+msgstr "Typ mezipaměti odpovědí je neznámý"
 
 #. krb5_err.et:krb5:KRB5_RC_TYPE_NOTFOUND
 #: ../src/dummy-strings.c:126
@@ -806,12 +808,12 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_RC_NOIO
 #: ../src/dummy-strings.c:130
 msgid "Replay cache name parse/format error"
-msgstr ""
+msgstr "Chyba zpracování/formátu názvu mezipaměti odpovědí"
 
 #. krb5_err.et:krb5:KRB5_RC_PARSE
 #: ../src/dummy-strings.c:131
 msgid "End-of-file on replay cache I/O"
-msgstr ""
+msgstr "Konec souboru při V/V operaci na mezipaměti odpovědí"
 
 #. krb5_err.et:krb5:KRB5_RC_IO_EOF
 #: ../src/dummy-strings.c:132
@@ -901,7 +903,7 @@ msgstr "Chyba zápisu do tabulky klíčů"
 #. krb5_err.et:krb5:KRB5_KT_IOERR
 #: ../src/dummy-strings.c:149
 msgid "Cannot find ticket for requested realm"
-msgstr "Pro požadovanou doménu nelze najít lístek"
+msgstr "Pro požadovanou sféru nelze najít lístek"
 
 #. krb5_err.et:krb5:KRB5_NO_TKT_IN_RLM
 #: ../src/dummy-strings.c:150
@@ -921,17 +923,17 @@ msgstr "Nesprávný způsob šifrování"
 #. krb5_err.et:krb5:KRB5_BAD_ENCTYPE
 #: ../src/dummy-strings.c:153
 msgid "Key size is incompatible with encryption type"
-msgstr ""
+msgstr "Velikost klíče je nekompatibilní s typem šifrování"
 
 #. krb5_err.et:krb5:KRB5_BAD_KEYSIZE
 #: ../src/dummy-strings.c:154
 msgid "Message size is incompatible with encryption type"
-msgstr ""
+msgstr "Velikost zprávy je nekompatibilní s typem šifrování"
 
 #. krb5_err.et:krb5:KRB5_BAD_MSIZE
 #: ../src/dummy-strings.c:155
 msgid "Credentials cache type is already registered."
-msgstr ""
+msgstr "Typ mezipaměti s pověřeními je již zaregistrován."
 
 #. krb5_err.et:krb5:KRB5_CC_TYPE_EXISTS
 #: ../src/dummy-strings.c:156
@@ -941,27 +943,27 @@ msgstr "Typ tabulky s klíči je již zaregistrován"
 #. krb5_err.et:krb5:KRB5_KT_TYPE_EXISTS
 #: ../src/dummy-strings.c:157
 msgid "Credentials cache I/O operation failed XXX"
-msgstr ""
+msgstr "V/V operace mezipaměti s pověřeními selhala XXX"
 
 #. krb5_err.et:krb5:KRB5_CC_IO
 #: ../src/dummy-strings.c:158
 msgid "Credentials cache permissions incorrect"
-msgstr "Nesprávná oprávnění mezipaměti přihlašovacích údajů"
+msgstr "Nesprávná oprávnění mezipaměti s pověřeními"
 
 #. krb5_err.et:krb5:KRB5_FCC_PERM
 #: ../src/dummy-strings.c:159
 msgid "No credentials cache found"
-msgstr "Nebyla nalezena mezipaměť přihlašovacích údajů"
+msgstr "Nebyla nalezena mezipaměť s pověřeními"
 
 #. krb5_err.et:krb5:KRB5_FCC_NOFILE
 #: ../src/dummy-strings.c:160
 msgid "Internal credentials cache error"
-msgstr ""
+msgstr "Interní chyba mezipaměti s pověřeními"
 
 #. krb5_err.et:krb5:KRB5_FCC_INTERNAL
 #: ../src/dummy-strings.c:161
 msgid "Error writing to credentials cache"
-msgstr ""
+msgstr "Chyba zápisu do mezipaměti s pověřeními"
 
 #. krb5_err.et:krb5:KRB5_CC_WRITE
 #: ../src/dummy-strings.c:162
@@ -971,22 +973,22 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_CC_NOMEM
 #: ../src/dummy-strings.c:163
 msgid "Bad format in credentials cache"
-msgstr ""
+msgstr "Chybný formát v mezipaměti pověření"
 
 #. krb5_err.et:krb5:KRB5_CC_FORMAT
 #: ../src/dummy-strings.c:164
 msgid "No credentials found with supported encryption types"
-msgstr ""
+msgstr "Nebylo nalezeno žádné pověření s podporovanými typy šifrování"
 
 #. krb5_err.et:krb5:KRB5_CC_NOT_KTYPE
 #: ../src/dummy-strings.c:165
 msgid "Invalid KDC option combination (library internal error)"
-msgstr ""
+msgstr "Neplatná kombinace voleb KDC (interní chyba knihovny)"
 
 #. krb5_err.et:krb5:KRB5_INVALID_FLAGS
 #: ../src/dummy-strings.c:166
 msgid "Request missing second ticket"
-msgstr ""
+msgstr "Požadavku schází druhý lístek"
 
 #. krb5_err.et:krb5:KRB5_NO_2ND_TKT
 #: ../src/dummy-strings.c:167
@@ -1031,17 +1033,17 @@ msgstr "Obecná chyba preautentizace"
 #. krb5_err.et:krb5:KRB5_PREAUTH_FAILED
 #: ../src/dummy-strings.c:175
 msgid "Unsupported replay cache format version number"
-msgstr ""
+msgstr "Nepodporované číslo verze formátu u mezipaměti odpovědí"
 
 #. krb5_err.et:krb5:KRB5_RCACHE_BADVNO
 #: ../src/dummy-strings.c:176
 msgid "Unsupported credentials cache format version number"
-msgstr ""
+msgstr "Nepodporované číslo verze formátu mezipaměti s pověřeními"
 
 #. krb5_err.et:krb5:KRB5_CCACHE_BADVNO
 #: ../src/dummy-strings.c:177
 msgid "Unsupported key table format version number"
-msgstr ""
+msgstr "Nepodporované číslo verze formátu tabulky s klíči"
 
 #. krb5_err.et:krb5:KRB5_KEYTAB_BADVNO
 #: ../src/dummy-strings.c:178
@@ -1061,7 +1063,7 @@ msgstr "Název počítače nelze převést do kanonického tvaru"
 #. krb5_err.et:krb5:KRB5_ERR_BAD_HOSTNAME
 #: ../src/dummy-strings.c:181
 msgid "Cannot determine realm for host"
-msgstr "Nelze zjistit realm pro hosta"
+msgstr "Nelze určit sféru pro počítač"
 
 #. krb5_err.et:krb5:KRB5_ERR_HOST_REALM_UNKNOWN
 #: ../src/dummy-strings.c:182
@@ -1076,7 +1078,7 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_V4_REPLY
 #: ../src/dummy-strings.c:184
 msgid "Cannot resolve network address for KDC in requested realm"
-msgstr ""
+msgstr "Nelze zjistit síťovou adresu pro KDC v požadované sféře"
 
 #. krb5_err.et:krb5:KRB5_REALM_CANT_RESOLVE
 #: ../src/dummy-strings.c:185
@@ -1086,17 +1088,17 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_TKT_NOT_FORWARDABLE
 #: ../src/dummy-strings.c:186
 msgid "Bad principal name while trying to forward credentials"
-msgstr ""
+msgstr "Chybný název principalu při pokusu o předání pověření"
 
 #. krb5_err.et:krb5:KRB5_FWD_BAD_PRINCIPAL
 #: ../src/dummy-strings.c:187
 msgid "Looping detected inside krb5_get_in_tkt"
-msgstr ""
+msgstr "Zjištěno zacyklení v krb5_get_in_tkt"
 
 #. krb5_err.et:krb5:KRB5_GET_IN_TKT_LOOP
 #: ../src/dummy-strings.c:188
 msgid "Configuration file does not specify default realm"
-msgstr ""
+msgstr "Soubor s nastavením neurčuje výchozí sféru"
 
 #. krb5_err.et:krb5:KRB5_CONFIG_NODEFREALM
 #: ../src/dummy-strings.c:189
@@ -1121,12 +1123,12 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_SAM_BAD_CHECKSUM
 #: ../src/dummy-strings.c:193
 msgid "Keytab name too long"
-msgstr ""
+msgstr "Název tabulky s klíči je příliš dlouhý"
 
 #. krb5_err.et:krb5:KRB5_KT_NAME_TOOLONG
 #: ../src/dummy-strings.c:194
 msgid "Key version number for principal in key table is incorrect"
-msgstr ""
+msgstr "Číslo verze klíče pro principal v tabulce klíčů je nesprávné"
 
 #. krb5_err.et:krb5:KRB5_KT_KVNONOTFOUND
 #: ../src/dummy-strings.c:195
@@ -1151,7 +1153,7 @@ msgstr "Změna hesla selhala"
 #. krb5_err.et:krb5:KRB5_CHPW_FAIL
 #: ../src/dummy-strings.c:199
 msgid "Bad format in keytab"
-msgstr ""
+msgstr "Chybný formát v tabulce klíčů"
 
 #. krb5_err.et:krb5:KRB5_KT_FORMAT
 #: ../src/dummy-strings.c:200
@@ -1176,7 +1178,7 @@ msgstr "selhání funkce getaddrinfo z neznámých příčin"
 #. krb5_err.et:krb5:KRB5_EAI_FAIL
 #: ../src/dummy-strings.c:204
 msgid "no data available for host/domain name"
-msgstr ""
+msgstr "nejsou dostupná žádná data pro název počítače/domény"
 
 #. krb5_err.et:krb5:KRB5_EAI_NODATA
 #: ../src/dummy-strings.c:205
@@ -1191,7 +1193,7 @@ msgstr "neznámé jméno služby"
 #. krb5_err.et:krb5:KRB5_EAI_SERVICE
 #: ../src/dummy-strings.c:207
 msgid "Cannot determine realm for numeric host address"
-msgstr ""
+msgstr "Nelze určit sféru pro číselnou adresu počítače"
 
 #. krb5_err.et:krb5:KRB5_ERR_NUMERIC_REALM
 #: ../src/dummy-strings.c:208
@@ -1206,12 +1208,12 @@ msgstr "služba není dostupná"
 #. krb5_err.et:krb5:KRB5_ERR_NO_SERVICE
 #: ../src/dummy-strings.c:210
 msgid "Ccache function not supported: read-only ccache type"
-msgstr ""
+msgstr "Funkce Ccache není podporována: typ ccache je ke čtení"
 
 #. krb5_err.et:krb5:KRB5_CC_READONLY
 #: ../src/dummy-strings.c:211
 msgid "Ccache function not supported: not implemented"
-msgstr ""
+msgstr "Funkce Ccache není podporována: neimplementováno"
 
 #. krb5_err.et:krb5:KRB5_CC_NOSUPP
 #: ../src/dummy-strings.c:212
@@ -1221,7 +1223,7 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_DELTAT_BADFORMAT
 #: ../src/dummy-strings.c:213
 msgid "Supplied data not handled by this plugin"
-msgstr ""
+msgstr "Dodaná data nejsou obsluhována tímto zásuvným modulem"
 
 #. krb5_err.et:krb5:KRB5_PLUGIN_NO_HANDLE
 #: ../src/dummy-strings.c:214
@@ -1231,227 +1233,227 @@ msgstr "Tato operace není modulem podporována"
 #. krb5_err.et:krb5:KRB5_PLUGIN_OP_NOTSUPP
 #: ../src/dummy-strings.c:215
 msgid "Kerberos V5 magic number table"
-msgstr ""
+msgstr "Tabulka magických čísel Kerberos V5"
 
 #. kv5m_err.et:kv5m:KV5M_NONE
 #: ../src/dummy-strings.c:216
 msgid "Bad magic number for krb5_principal structure"
-msgstr "Špatné magické číslo pro krb5_principal structure"
+msgstr "Špatné magické číslo pro strukturu krb5_principale"
 
 #. kv5m_err.et:kv5m:KV5M_PRINCIPAL
 #: ../src/dummy-strings.c:217
 msgid "Bad magic number for krb5_data structure"
-msgstr "Špatné magické číslo pro krb5_data structure"
+msgstr "Špatné magické číslo pro strukturu krb5_data"
 
 #. kv5m_err.et:kv5m:KV5M_DATA
 #: ../src/dummy-strings.c:218
 msgid "Bad magic number for krb5_keyblock structure"
-msgstr "Špatné magické číslo pro krb5_keyblock structure"
+msgstr "Špatné magické číslo pro strukturu krb5_keyblock"
 
 #. kv5m_err.et:kv5m:KV5M_KEYBLOCK
 #: ../src/dummy-strings.c:219
 msgid "Bad magic number for krb5_checksum structure"
-msgstr "Špatné magické číslo pro krb5_checksum structure"
+msgstr "Špatné magické číslo pro strukturu krb5_checksum"
 
 #. kv5m_err.et:kv5m:KV5M_CHECKSUM
 #: ../src/dummy-strings.c:220
 msgid "Bad magic number for krb5_encrypt_block structure"
-msgstr "Špatné magické číslo pro krb5_encrypt_block structure"
+msgstr "Špatné magické číslo pro strukturu krb5_encrypt_block"
 
 #. kv5m_err.et:kv5m:KV5M_ENCRYPT_BLOCK
 #: ../src/dummy-strings.c:221
 msgid "Bad magic number for krb5_enc_data structure"
-msgstr "Špatné magické číslo pro krb5_enc_data structure"
+msgstr "Špatné magické číslo pro strukturu krb5_enc_data"
 
 #. kv5m_err.et:kv5m:KV5M_ENC_DATA
 #: ../src/dummy-strings.c:222
 msgid "Bad magic number for krb5_cryptosystem_entry structure"
-msgstr "Špatné magické číslo pro krb5_cryptosystem_entry structure"
+msgstr "Špatné magické číslo pro strukturu krb5_cryptosystem_entry"
 
 #. kv5m_err.et:kv5m:KV5M_CRYPTOSYSTEM_ENTRY
 #: ../src/dummy-strings.c:223
 msgid "Bad magic number for krb5_cs_table_entry structure"
-msgstr "Špatné magické číslo pro krb5_cs_table_entry structure"
+msgstr "Špatné magické číslo pro strukturu krb5_cs_table_entry"
 
 #. kv5m_err.et:kv5m:KV5M_CS_TABLE_ENTRY
 #: ../src/dummy-strings.c:224
 msgid "Bad magic number for krb5_checksum_entry structure"
-msgstr "Špatné magické číslo pro krb5_checksum_entry structure"
+msgstr "Špatné magické číslo pro strukturu krb5_checksum_entry"
 
 #. kv5m_err.et:kv5m:KV5M_CHECKSUM_ENTRY
 #: ../src/dummy-strings.c:225
 msgid "Bad magic number for krb5_authdata structure"
-msgstr "Špatné magické číslo pro krb5_authdata structure"
+msgstr "Špatné magické číslo pro strukturu krb5_authdata"
 
 #. kv5m_err.et:kv5m:KV5M_AUTHDATA
 #: ../src/dummy-strings.c:226
 msgid "Bad magic number for krb5_transited structure"
-msgstr "Špatné magické číslo pro krb5_transited structure"
+msgstr "Špatné magické číslo pro strukturu krb5_transited"
 
 #. kv5m_err.et:kv5m:KV5M_TRANSITED
 #: ../src/dummy-strings.c:227
 msgid "Bad magic number for krb5_enc_tkt_part structure"
-msgstr "Špatné magické číslo pro krb5_enc_tkt_part structure"
+msgstr "Špatné magické číslo pro strukturu krb5_enc_tkt_part"
 
 #. kv5m_err.et:kv5m:KV5M_ENC_TKT_PART
 #: ../src/dummy-strings.c:228
 msgid "Bad magic number for krb5_ticket structure"
-msgstr "Špatné magické číslo pro krb5_ticket structure"
+msgstr "Špatné magické číslo pro strukturu krb5_ticket"
 
 #. kv5m_err.et:kv5m:KV5M_TICKET
 #: ../src/dummy-strings.c:229
 msgid "Bad magic number for krb5_authenticator structure"
-msgstr "Špatné magické číslo pro krb5_authenticator structure"
+msgstr "Špatné magické číslo pro strukturu krb5_authenticator"
 
 #. kv5m_err.et:kv5m:KV5M_AUTHENTICATOR
 #: ../src/dummy-strings.c:230
 msgid "Bad magic number for krb5_tkt_authent structure"
-msgstr "Špatné magické číslo pro krb5_tkt_authent structure"
+msgstr "Špatné magické číslo pro strukturu krb5_tkt_authent"
 
 #. kv5m_err.et:kv5m:KV5M_TKT_AUTHENT
 #: ../src/dummy-strings.c:231
 msgid "Bad magic number for krb5_creds structure"
-msgstr "Špatné magické číslo pro krb5_creds structure"
+msgstr "Špatné magické číslo pro strukturu krb5_creds"
 
 #. kv5m_err.et:kv5m:KV5M_CREDS
 #: ../src/dummy-strings.c:232
 msgid "Bad magic number for krb5_last_req_entry structure"
-msgstr "Špatné magické číslo pro krb5_last_req_entry structure"
+msgstr "Špatné magické číslo pro strukturu krb5_last_req_entry"
 
 #. kv5m_err.et:kv5m:KV5M_LAST_REQ_ENTRY
 #: ../src/dummy-strings.c:233
 msgid "Bad magic number for krb5_pa_data structure"
-msgstr "Špatné magické číslo pro krb5_pa_data structure"
+msgstr "Špatné magické číslo pro strukturu krb5_pa_data"
 
 #. kv5m_err.et:kv5m:KV5M_PA_DATA
 #: ../src/dummy-strings.c:234
 msgid "Bad magic number for krb5_kdc_req structure"
-msgstr "Špatné magické číslo pro krb5_kdc_req structure"
+msgstr "Špatné magické číslo pro strukturu krb5_kdc_req"
 
 #. kv5m_err.et:kv5m:KV5M_KDC_REQ
 #: ../src/dummy-strings.c:235
 msgid "Bad magic number for krb5_enc_kdc_rep_part structure"
-msgstr "Špatné magické číslo pro krb5_enc_kdc_rep_part structure"
+msgstr "Špatné magické číslo pro strukturu krb5_enc_kdc_rep_part"
 
 #. kv5m_err.et:kv5m:KV5M_ENC_KDC_REP_PART
 #: ../src/dummy-strings.c:236
 msgid "Bad magic number for krb5_kdc_rep structure"
-msgstr "Špatné magické číslo pro krb5_kdc_rep structure"
+msgstr "Špatné magické číslo pro strukturu krb5_kdc_rep"
 
 #. kv5m_err.et:kv5m:KV5M_KDC_REP
 #: ../src/dummy-strings.c:237
 msgid "Bad magic number for krb5_error structure"
-msgstr "Špatné magické číslo pro krb5_error structure"
+msgstr "Špatné magické číslo pro strukturu krb5_error"
 
 #. kv5m_err.et:kv5m:KV5M_ERROR
 #: ../src/dummy-strings.c:238
 msgid "Bad magic number for krb5_ap_req structure"
-msgstr "Špatné magické číslo pro krb5_ap_req structure"
+msgstr "Špatné magické číslo pro strukturu krb5_ap_req"
 
 #. kv5m_err.et:kv5m:KV5M_AP_REQ
 #: ../src/dummy-strings.c:239
 msgid "Bad magic number for krb5_ap_rep structure"
-msgstr "Špatné magické číslo pro krb5_ap_rep structure"
+msgstr "Špatné magické číslo pro strukturu krb5_ap_rep"
 
 #. kv5m_err.et:kv5m:KV5M_AP_REP
 #: ../src/dummy-strings.c:240
 msgid "Bad magic number for krb5_ap_rep_enc_part structure"
-msgstr "Špatné magické číslo pro krb5_ap_rep_enc_part structure"
+msgstr "Špatné magické číslo pro strukturu krb5_ap_rep_enc_part"
 
 #. kv5m_err.et:kv5m:KV5M_AP_REP_ENC_PART
 #: ../src/dummy-strings.c:241
 msgid "Bad magic number for krb5_response structure"
-msgstr "Špatné magické číslo pro krb5_response structure"
+msgstr "Špatné magické číslo pro strukturu krb5_response"
 
 #. kv5m_err.et:kv5m:KV5M_RESPONSE
 #: ../src/dummy-strings.c:242
 msgid "Bad magic number for krb5_safe structure"
-msgstr "Špatné magické číslo pro krb5_safe structure"
+msgstr "Špatné magické číslo pro strukturu krb5_safe"
 
 #. kv5m_err.et:kv5m:KV5M_SAFE
 #: ../src/dummy-strings.c:243
 msgid "Bad magic number for krb5_priv structure"
-msgstr "Špatné magické číslo pro krb5_priv structure"
+msgstr "Špatné magické číslo pro strukturu krb5_priv"
 
 #. kv5m_err.et:kv5m:KV5M_PRIV
 #: ../src/dummy-strings.c:244
 msgid "Bad magic number for krb5_priv_enc_part structure"
-msgstr "Špatné magické číslo pro krb5_priv_enc_part structure"
+msgstr "Špatné magické číslo pro strukturu krb5_priv_enc_part"
 
 #. kv5m_err.et:kv5m:KV5M_PRIV_ENC_PART
 #: ../src/dummy-strings.c:245
 msgid "Bad magic number for krb5_cred structure"
-msgstr "Špatné magické číslo pro krb5_cred structure"
+msgstr "Špatné magické číslo pro strukturu krb5_cred"
 
 #. kv5m_err.et:kv5m:KV5M_CRED
 #: ../src/dummy-strings.c:246
 msgid "Bad magic number for krb5_cred_info structure"
-msgstr "Špatné magické číslo pro krb5_cred_info structure"
+msgstr "Špatné magické číslo pro strukturu krb5_cred_info"
 
 #. kv5m_err.et:kv5m:KV5M_CRED_INFO
 #: ../src/dummy-strings.c:247
 msgid "Bad magic number for krb5_cred_enc_part structure"
-msgstr "Špatné magické číslo pro krb5_cred_enc_part structure"
+msgstr "Špatné magické číslo pro strukturu krb5_cred_enc_part"
 
 #. kv5m_err.et:kv5m:KV5M_CRED_ENC_PART
 #: ../src/dummy-strings.c:248
 msgid "Bad magic number for krb5_pwd_data structure"
-msgstr "Špatné magické číslo pro krb5_pwd_data structure"
+msgstr "Špatné magické číslo pro strukturu krb5_pwd_data"
 
 #. kv5m_err.et:kv5m:KV5M_PWD_DATA
 #: ../src/dummy-strings.c:249
 msgid "Bad magic number for krb5_address structure"
-msgstr "Špatné magické číslo pro krb5_address structure"
+msgstr "Špatné magické číslo pro strukturu krb5_address"
 
 #. kv5m_err.et:kv5m:KV5M_ADDRESS
 #: ../src/dummy-strings.c:250
 msgid "Bad magic number for krb5_keytab_entry structure"
-msgstr "Špatné magické číslo pro krb5_keytab_entry structure"
+msgstr "Špatné magické číslo pro strukturu krb5_keytab_entry"
 
 #. kv5m_err.et:kv5m:KV5M_KEYTAB_ENTRY
 #: ../src/dummy-strings.c:251
 msgid "Bad magic number for krb5_context structure"
-msgstr "Špatné magické číslo pro krb5_context structure"
+msgstr "Špatné magické číslo pro strukturu krb5_context"
 
 #. kv5m_err.et:kv5m:KV5M_CONTEXT
 #: ../src/dummy-strings.c:252
 msgid "Bad magic number for krb5_os_context structure"
-msgstr "Špatné magické číslo pro krb5_os_context structure"
+msgstr "Špatné magické číslo pro strukturu krb5_os_context"
 
 #. kv5m_err.et:kv5m:KV5M_OS_CONTEXT
 #: ../src/dummy-strings.c:253
 msgid "Bad magic number for krb5_alt_method structure"
-msgstr "Špatné magické číslo pro krb5_alt_method structure"
+msgstr "Špatné magické číslo pro strukturu krb5_alt_method"
 
 #. kv5m_err.et:kv5m:KV5M_ALT_METHOD
 #: ../src/dummy-strings.c:254
 msgid "Bad magic number for krb5_etype_info_entry structure"
-msgstr "Špatné magické číslo pro krb5_etype_info_entry structure"
+msgstr "Špatné magické číslo pro strukturu krb5_etype_info_entry"
 
 #. kv5m_err.et:kv5m:KV5M_ETYPE_INFO_ENTRY
 #: ../src/dummy-strings.c:255
 msgid "Bad magic number for krb5_db_context structure"
-msgstr "Špatné magické číslo pro krb5_db_context structure"
+msgstr "Špatné magické číslo pro strukturu krb5_db_context"
 
 #. kv5m_err.et:kv5m:KV5M_DB_CONTEXT
 #: ../src/dummy-strings.c:256
 msgid "Bad magic number for krb5_auth_context structure"
-msgstr "Špatné magické číslo pro krb5_auth_context structure"
+msgstr "Špatné magické číslo pro strukturu krb5_auth_context"
 
 #. kv5m_err.et:kv5m:KV5M_AUTH_CONTEXT
 #: ../src/dummy-strings.c:257
 msgid "Bad magic number for krb5_keytab structure"
-msgstr "Špatné magické číslo pro krb5_keytab structure"
+msgstr "Špatné magické číslo pro strukturu krb5_keytab"
 
 #. kv5m_err.et:kv5m:KV5M_KEYTAB
 #: ../src/dummy-strings.c:258
 msgid "Bad magic number for krb5_rcache structure"
-msgstr "Špatné magické číslo pro krb5_rcache structure"
+msgstr "Špatné magické číslo pro strukturu krb5_rcache"
 
 #. kv5m_err.et:kv5m:KV5M_RCACHE
 #: ../src/dummy-strings.c:259
 msgid "Bad magic number for krb5_ccache structure"
-msgstr "Špatné magické číslo pro krb5_ccache structure"
+msgstr "Špatné magické číslo pro strukturu krb5_ccache"
 
 #. kv5m_err.et:kv5m:KV5M_CCACHE
 #: ../src/dummy-strings.c:260
@@ -1509,57 +1511,57 @@ msgstr "Špatné magické číslo pro GSSAPI OID"
 msgid "Bad magic number for GSSAPI QUEUE"
 msgstr "Špatné magické číslo pro GSSAPI QUEUE"
 
-#: ../src/ka-applet.c:362
+#: ../src/ka-applet.c:460
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
-msgstr "Vaše přihlašovací údaje vyprší za %.2d:%.2dh"
+msgstr "Vaše pověření vyprší za %.2d:%.2dh"
 
-#: ../src/ka-applet.c:544
+#: ../src/ka-applet.c:642
 msgid "List Tickets"
 msgstr "Lístky služeb"
 
-#: ../src/ka-applet.c:554
+#: ../src/ka-applet.c:652
 msgid "Get Ticket"
 msgstr "Získat lístek"
 
-#: ../src/ka-applet.c:563
+#: ../src/ka-applet.c:661
 msgid "Don't show me this again"
 msgstr "Znovu nezobrazovat"
 
-#: ../src/ka-applet.c:570
+#: ../src/ka-applet.c:668
 msgid "Remove Credentials Cache"
-msgstr "Odstranit mezipaměť přihlašovacích údajů"
+msgstr "Odstranit mezipaměť s pověřeními"
 
-#: ../src/ka-applet.c:619
+#: ../src/ka-applet.c:717
 msgid "You have valid Kerberos credentials."
-msgstr "Vaše přihlašovací údaje jsou platné."
+msgstr "Vaše pověření jsou platná."
 
-#: ../src/ka-applet.c:621
+#: ../src/ka-applet.c:719
 msgid "You've refreshed your Kerberos credentials."
-msgstr "Aktualizovali jste své přihlašovací údaje."
+msgstr "Aktualizovali jste svá pověření Kerberos."
 
-#: ../src/ka-applet.c:624
+#: ../src/ka-applet.c:722
 msgid "Network credentials valid"
-msgstr "Síťové přihlašovací údaje jsou platné"
+msgstr "Síťová pověření jsou platná"
 
-#: ../src/ka-applet.c:643
+#: ../src/ka-applet.c:741
 msgid "Network credentials expiring"
-msgstr "Blíží se konec platnosti síťových přihlašovacích údajů"
+msgstr "Blíží se konec platnosti síťových pověření"
 
-#: ../src/ka-applet.c:661
+#: ../src/ka-applet.c:759
 msgid "Network credentials expired"
-msgstr "Platnost síťových přihlašovacích údajů vypršela"
+msgstr "Platnost síťových pověření vypršela"
 
-#: ../src/ka-applet.c:662
-msgid "Your Kerberos credentails have expired."
-msgstr "Platnost vašich přihlašovacích údajů Kerberos vypršela."
+#: ../src/ka-applet.c:760
+msgid "Your Kerberos credentials have expired."
+msgstr "Platnost vašich pověření Kerberos vypršela."
 
-#: ../src/ka-applet.c:741
+#: ../src/ka-applet.c:839
 msgid "Remove Credentials _Cache"
-msgstr "Odstranit mezipaměť přihlašova_cích údajů"
+msgstr "Odstranit _mezipaměť s pověřeními"
 
 #. Ticket dialog
-#: ../src/ka-applet.c:751
+#: ../src/ka-applet.c:849
 msgid "_List Tickets"
 msgstr "_Lístky služeb"
 
@@ -1589,19 +1591,22 @@ msgstr "Začátek platnosti"
 msgid "End Time"
 msgstr "Konec platnosti"
 
-#: ../src/ka-main-window.c:137
+#. Translators: this is an abbreviation for forwardable
+#: ../src/ka-main-window.c:138
 msgid "Fwd"
 msgstr "Předat"
 
-#: ../src/ka-main-window.c:143
+#. Translators: this is an abbreviation for proxiable
+#: ../src/ka-main-window.c:145
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/ka-main-window.c:149
+#. Translators: this is an abbreviation for renewable
+#: ../src/ka-main-window.c:152
 msgid "Renew"
 msgstr "Obnovit"
 
-#: ../src/ka-main-window.c:176
+#: ../src/ka-main-window.c:179
 msgid "Error displaying service ticket information"
 msgstr "Chyba zobrazení informací o lístku služby"
 
@@ -1622,104 +1627,95 @@ msgid "Kerberos Network Authentication Dialog"
 msgstr "Dialog síťové autentizace Kerberos"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:1
-msgid "Enabled plugins"
-msgstr "Povolené zásuvné moduly"
+msgid "Kerberos principal"
+msgstr "Kerberos principal"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:2
-msgid "Forwardable ticket"
-msgstr ""
+msgid "The kerberos principal to acquire the ticket for"
+msgstr "Kerberos principal, pro který bude získán lístek"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:3
-msgid "Kerberos principal"
-msgstr "Kerberos principal"
+msgid "PKINIT identifier"
+msgstr "Identifikátor PKINIT"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:4
-msgid "List of plugins that should be loaded and activated on startup."
-msgstr "Seznam zásuvných modulů, které budou nahrány a aktivovány při startu."
+msgid "The principal's public/private/certificate identifier when using PKINIT"
+msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:5
-msgid "Notify user when ticket becomes valid"
-msgstr "Upozornit uživatele, když lístek začne platit"
+msgid "PKINIT trust anchors"
+msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:6
-msgid "Notify user when ticket has expired"
-msgstr "Upozornit uživatele, když lístek přestane platit"
+msgid "PKINIT CA certificates"
+msgstr "Certifikát CA pro PKINIT"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:7
-msgid "Notify user when ticket is about to expire"
-msgstr "Upozornit uživatele na blížící se vypršení platnosti lístku"
+msgid "Prompt minutes before expiry"
+msgstr "Počet minut připomenutí před koncem platnosti"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:8
-msgid "PKINIT CA certificates"
-msgstr "Certifikát CA pro PKINIT"
+msgid ""
+"Start prompting/displaying notifications that many minutes before expiry"
+msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:9
-msgid "PKINIT identifier"
-msgstr "Identifikátor PKINIT"
+msgid "Forwardable ticket"
+msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:10
-msgid "PKINIT trust anchors"
+msgid "Requested tickets should be forwardable"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:11
-msgid "Prompt minutes before expiry"
-msgstr "Počet minut připomenutí před koncem platnosti"
+msgid "Renewable ticket"
+msgstr "Obnovitelný lístek"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:12
-msgid "Proxiable ticket"
-msgstr ""
+msgid "Requested tickets should be renewable"
+msgstr "Požadované lístky by měly být obnovitelné"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:13
-msgid "Renewable ticket"
-msgstr "Obnovitelný lístek"
+msgid "Proxiable ticket"
+msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:14
-msgid "Requested tickets should be forwardable"
+msgid "Requested tickets should be proxiable"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:15
-msgid "Requested tickets should be proxiable"
+msgid "valid ticket notification"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:16
-msgid "Requested tickets should be renewable"
-msgstr "Požadované lístky by měly být obnovitelné"
+msgid "Notify user when ticket becomes valid"
+msgstr "Upozornit uživatele, když lístek začne platit"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:17
-msgid ""
-"Start prompting/displaying notifications that many minutes before expiry"
-msgstr ""
+msgid "ticket expiring notification"
+msgstr "upozornění na blížící se vypršení platnosti lístku"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:18
-msgid "The kerberos principal to acquire the ticket for"
-msgstr "Kerberos principal, pro který bude získán lístek"
+msgid "Notify user when ticket is about to expire"
+msgstr "Upozornit uživatele na blížící se vypršení platnosti lístku"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:19
-msgid "The principal's public/private/certificate identifier when using PKINIT"
-msgstr ""
-
-#: ../src/krb5-auth-dialog.schemas.in.h:20
 msgid "ticket expired notification"
 msgstr "upozornění při vypršení platnosti lístku"
 
+#: ../src/krb5-auth-dialog.schemas.in.h:20
+msgid "Notify user when ticket has expired"
+msgstr "Upozornit uživatele, když lístek přestane platit"
+
 #: ../src/krb5-auth-dialog.schemas.in.h:21
-msgid "ticket expiring notification"
-msgstr "upozornění na blížící se vypršení platnosti lístku"
+msgid "Enabled plugins"
+msgstr "Povolené zásuvné moduly"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:22
-msgid "valid ticket notification"
-msgstr ""
+msgid "List of plugins that should be loaded and activated on startup."
+msgstr "Seznam zásuvných modulů, které budou nahrány a aktivovány při startu."
 
 #: ../secmem/util.c:106
 #, c-format
 msgid "Warning: running q-agent setuid on this system is dangerous\n"
-msgstr "Pozor: provozovat q-agent setuid na tomto systému je nebezpečné\n"
-
-#~ msgid "There was an error launching the preferences dialog: %s"
-#~ msgstr "Při spouštění dialogového okna předvoleb došlo k chybě: %s "
-
-#~ msgid "Kerberos;Authentication"
-#~ msgstr "Kerberos;Autentizace"
-
-#~ msgid "Set your Kerberos network authentication preferences"
-#~ msgstr "Nastavte své předvolby síťové autentizace Kerberos"
+msgstr "Pozor: provozovat q-agent setuid na tomto systému je nebezpečné\n"
+\ No newline at end of file
diff --git a/po/es.po b/po/es.po
index e7459eb..7fca525 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,58 +3,173 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Jorge González <jorgegonz@svn.gnome.org>, 2009, 2010.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2009, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2009, 2011, 2012.
 #
 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&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-04 18:15+0000\n"
-"PO-Revision-Date: 2011-09-05 13:53+0200\n"
+"POT-Creation-Date: 2012-05-25 19:15+0000\n"
+"PO-Revision-Date: 2012-05-27 12:01+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\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"
+"X-Generator: Gtranslator 2.91.4\n"
 
+#.
+#. * vim:ts:sts=4:sw=4:et:
+#.
 #: ../src/krb5-auth-dialog.ui.h:1 ../src/krb5-auth-dialog.desktop.in.h:1
-#: ../cc-panel/gnome-ka-panel.desktop.in.h:1
 msgid "Kerberos Authentication"
 msgstr "Autenticación de Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:2
-msgid "Service Tickets"
-msgstr "Tiques de servicio"
+msgid "_Renew Ticket"
+msgstr "_Renovar tique"
 
 #: ../src/krb5-auth-dialog.ui.h:3
-#| msgid "_Quit"
-msgid "_Edit"
-msgstr "_Editar"
+msgid "Service Tickets"
+msgstr "Tiques de servicio"
 
 #: ../src/krb5-auth-dialog.ui.h:4
 msgid "_File"
 msgstr "_Archivo"
 
 #: ../src/krb5-auth-dialog.ui.h:5
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../src/krb5-auth-dialog.ui.h:6
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../src/krb5-auth-dialog.ui.h:6
-msgid "_Renew Ticket"
-msgstr "_Renovar tique"
+#: ../src/krb5-auth-dialog.ui.h:7
+msgid "Kerberos User"
+msgstr "Usuario de Kerberos"
+
+#: ../src/krb5-auth-dialog.ui.h:8
+msgid ""
+"The name of your Kerberos account. Leave blank to use your current username."
+msgstr ""
+"El nombre de su cuenta de Kerberos. Déjelo en blanco para usar su nombre de "
+"usuario actual."
+
+#: ../src/krb5-auth-dialog.ui.h:9
+msgid "Kerberos principal:"
+msgstr "Principal de Kerberos:"
+
+#: ../src/krb5-auth-dialog.ui.h:10
+msgid "Kerberos Ticket Options"
+msgstr "Opciones del tique de Kerberos"
+
+#: ../src/krb5-auth-dialog.ui.h:11
+msgid "Requested Kerberos tickets should be:"
+msgstr "Los tiques solicitados a Kerberos deben ser:"
+
+#: ../src/krb5-auth-dialog.ui.h:12
+msgid "forwardable"
+msgstr "reenviable"
+
+#: ../src/krb5-auth-dialog.ui.h:13
+msgid "If checked, request forwardable tickets"
+msgstr "Si está seleccionado pide tiques reenviables"
+
+#: ../src/krb5-auth-dialog.ui.h:14
+msgid "renewable"
+msgstr "renovable"
+
+#: ../src/krb5-auth-dialog.ui.h:15
+msgid "If checked, request renewable tickets"
+msgstr "Si está seleccionado pide tiques renovables"
+
+#: ../src/krb5-auth-dialog.ui.h:16
+msgid "proxiable"
+msgstr "vía proxy"
+
+#: ../src/krb5-auth-dialog.ui.h:17
+msgid "If checked, request proxiable tickets"
+msgstr "Si está seleccionado pide tiques vía proxy"
+
+#: ../src/krb5-auth-dialog.ui.h:18
+msgid "Kerberos"
+msgstr "Kerberos"
+
+#: ../src/krb5-auth-dialog.ui.h:19
+msgid "Userid"
+msgstr "ID de usuario"
+
+#: ../src/krb5-auth-dialog.ui.h:20
+msgid "Use Smartcard"
+msgstr "Usar tarjeta inteligente"
+
+#: ../src/krb5-auth-dialog.ui.h:21
+msgid "If checked, use a security token (Smartcard) to authenticate."
+msgstr ""
+"Si está seleccionado usa un «token» (tarjeta inteligente) para autenticar."
+
+#: ../src/krb5-auth-dialog.ui.h:22
+msgid "Certificate and private key used for authentication"
+msgstr "Certificado y clave privada usados para la autenticación"
+
+#: ../src/krb5-auth-dialog.ui.h:23
+msgid "_Browse..."
+msgstr "_Examinar…"
+
+#: ../src/krb5-auth-dialog.ui.h:24
+msgid "X509 trust anchors"
+msgstr "Anclas de confianza de X509"
+
+#: ../src/krb5-auth-dialog.ui.h:25
+msgid "Certificate used to verify digital signatures."
+msgstr "Certificado usado para comprobar firmas digitales."
+
+#: ../src/krb5-auth-dialog.ui.h:26
+msgid ""
+"Configure the use of certificates and smartcards for your Kerberos network "
+"authentication."
+msgstr ""
+"Configurar el uso de certificados y tarjetas inteligentes para su "
+"autenticación de red de Kerberos."
+
+#: ../src/krb5-auth-dialog.ui.h:27
+msgid "PKINIT"
+msgstr "PKINIT"
+
+#: ../src/krb5-auth-dialog.ui.h:28
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#. Used in combination: 'Warn x minutes before expiry'
+#: ../src/krb5-auth-dialog.ui.h:30
+msgid "Warn"
+msgstr "Advertir"
 
-#: ../src/ka-dialog.c:177
+#: ../src/krb5-auth-dialog.ui.h:31
+msgid ""
+"Send notification about ticket expiry that many minutes before it finally "
+"expires"
+msgstr ""
+"Enviar notificación acerca de la caducidad del tique esos minutos antes de "
+"que caduque"
+
+#. Used in combination: 'Warn x minutes before expiry'
+#: ../src/krb5-auth-dialog.ui.h:33
+msgid "minutes before ticket expiry"
+msgstr "minutos antes de que caduque el tique"
+
+#: ../src/ka-kerberos.c:177
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: ../src/ka-dialog.c:317
+#: ../src/ka-kerberos.c:317
 msgid "Your ticket cache is currently empty"
 msgstr "Su caché de tiques está vacía actualmente"
 
-#: ../src/ka-dialog.c:343
+#: ../src/ka-kerberos.c:341
 msgid "Expired"
 msgstr "Caducado"
 
@@ -63,14 +178,14 @@ msgstr "Caducado"
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr "No se pudo obtener el tique de Kerberos: «%s»"
 
-#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:367
+#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:466
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
 msgstr[0] "Sus credenciales caducan en %d minuto"
 msgstr[1] "Sus credenciales caducan en %d minutos"
 
-#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:372
+#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:471
 msgid "Your credentials have expired"
 msgstr "Sus credenciales han caducado"
 
@@ -1419,62 +1534,58 @@ msgstr "Número mágico erróneo para GSSAPI OID"
 msgid "Bad magic number for GSSAPI QUEUE"
 msgstr "Número mágico erróneo para GSSAPI QUEUE"
 
-#: ../src/ka-applet.c:361
+#: ../src/ka-applet.c:460
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "Sus credenciales caducan en %.2d:%.2dh"
 
-#: ../src/ka-applet.c:543
+#: ../src/ka-applet.c:642
 msgid "List Tickets"
 msgstr "Listar tiques"
 
-#: ../src/ka-applet.c:553
+#: ../src/ka-applet.c:652
 msgid "Get Ticket"
 msgstr "Obtener tique"
 
-#: ../src/ka-applet.c:562
+#: ../src/ka-applet.c:661
 msgid "Don't show me this again"
 msgstr "No mostrar este mensaje de nuevo"
 
-#: ../src/ka-applet.c:569
+#: ../src/ka-applet.c:668
 msgid "Remove Credentials Cache"
 msgstr "Quitar la caché de credenciales"
 
-#: ../src/ka-applet.c:618
+#: ../src/ka-applet.c:717
 msgid "You have valid Kerberos credentials."
 msgstr "Sus credenciales de Kerberos son válidas."
 
-#: ../src/ka-applet.c:620
+#: ../src/ka-applet.c:719
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Ha actualizado sus credenciales de Kerberos."
 
-#: ../src/ka-applet.c:623
+#: ../src/ka-applet.c:722
 msgid "Network credentials valid"
 msgstr "Credenciales de red válidas"
 
-#: ../src/ka-applet.c:642
+#: ../src/ka-applet.c:741
 msgid "Network credentials expiring"
 msgstr "Las credenciales de red van a caducar"
 
-#: ../src/ka-applet.c:660
+#: ../src/ka-applet.c:759
 msgid "Network credentials expired"
 msgstr "Las credenciales de red han caducado"
 
-#: ../src/ka-applet.c:661
-msgid "Your Kerberos credentails have expired."
-msgstr "Sus credenciales Kerberos han caducado"
+#: ../src/ka-applet.c:760
+#| msgid "Your Kerberos credentails have expired."
+msgid "Your Kerberos credentials have expired."
+msgstr "Sus credenciales de Kerberos han caducado."
 
-#: ../src/ka-applet.c:705
-#, c-format
-msgid "There was an error launching the preferences dialog: %s"
-msgstr "Hubo un error al lanzar el diálogo de preferencias: %s"
-
-#: ../src/ka-applet.c:775
+#: ../src/ka-applet.c:839
 msgid "Remove Credentials _Cache"
 msgstr "Quitar la _caché de credenciales"
 
 #. Ticket dialog
-#: ../src/ka-applet.c:785
+#: ../src/ka-applet.c:849
 msgid "_List Tickets"
 msgstr "_Listar tiques"
 
@@ -1494,267 +1605,156 @@ msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2009-2010\n"
 "Daniel Mustieles <daniel.mustieles@gmail.com>, 2009"
 
-#: ../src/ka-main-window.c:118
+#: ../src/ka-main-window.c:119
 msgid "Principal"
 msgstr "Principal"
 
-#: ../src/ka-main-window.c:124
+#: ../src/ka-main-window.c:125
 msgid "Start Time"
 msgstr "Tiempo de inicio"
 
-#: ../src/ka-main-window.c:130
+#: ../src/ka-main-window.c:131
 msgid "End Time"
 msgstr "Tiempo de finalización"
 
-#: ../src/ka-main-window.c:136
+#. Translators: this is an abbreviation for forwardable
+#: ../src/ka-main-window.c:138
 msgid "Fwd"
 msgstr "Rnv"
 
-#: ../src/ka-main-window.c:142
+#. Translators: this is an abbreviation for proxiable
+#: ../src/ka-main-window.c:145
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/ka-main-window.c:148
+#. Translators: this is an abbreviation for renewable
+#: ../src/ka-main-window.c:152
 msgid "Renew"
 msgstr "Renovar"
 
-#: ../src/ka-main-window.c:175
+#: ../src/ka-main-window.c:179
 msgid "Error displaying service ticket information"
 msgstr "Error al mostrar la información del tique de servicio"
 
+#: ../src/ka-preferences.c:340
+msgid "Choose Certificate"
+msgstr "Elija un certificado"
+
+#: ../src/ka-preferences.c:356
+msgid "X509 Certificates"
+msgstr "Certificados X509"
+
+#: ../src/ka-preferences.c:360
+msgid "all files"
+msgstr "todos los archivos"
+
 #: ../src/krb5-auth-dialog.desktop.in.h:2
 msgid "Kerberos Network Authentication Dialog"
 msgstr "Diálogo de autenticación de red de Kerberos"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:1
-msgid "Enabled plugins"
-msgstr "Complementos activados"
+msgid "Kerberos principal"
+msgstr "Principal de Kerberos"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:2
-msgid "Forwardable ticket"
-msgstr "Tique reenviable"
+msgid "The kerberos principal to acquire the ticket for"
+msgstr "El principal de Kerberos para el que adquirir el tique"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:3
-msgid "Kerberos principal"
-msgstr "Principal de Kerberos"
+msgid "PKINIT identifier"
+msgstr "Identificador PKINIT"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:4
-msgid "List of plugins that should be loaded and activated on startup."
-msgstr "Lista de complementos que se debería cargar y activar al inicio."
+msgid "The principal's public/private/certificate identifier when using PKINIT"
+msgstr ""
+"El identificador público/privado/certificado del principal al usar PKINIT"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:5
-msgid "Notify user when ticket becomes valid"
-msgstr "Notificar al usuario cuando un tique se convierta en válido"
+msgid "PKINIT trust anchors"
+msgstr "Anclas de confianza de PKINIT"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:6
-msgid "Notify user when ticket has expired"
-msgstr "Notificar al usuario cuando un tique ha caducado"
+msgid "PKINIT CA certificates"
+msgstr "Certificados PKINIT CA"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:7
-msgid "Notify user when ticket is about to expire"
-msgstr "Notificar al usuario cuando un tique va a caducar"
+msgid "Prompt minutes before expiry"
+msgstr "Mostrar minutos antes de caducar"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:8
-msgid "PKINIT CA certificates"
-msgstr "Certificados PKINIT CA"
+msgid ""
+"Start prompting/displaying notifications that many minutes before expiry"
+msgstr "Dejar de mostrar notificaciones esos minutos antes de que caduque"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:9
-msgid "PKINIT identifier"
-msgstr "Identificador PKINIT"
+msgid "Forwardable ticket"
+msgstr "Tique reenviable"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:10
-msgid "PKINIT trust anchors"
-msgstr "Anclas de confianza de PKINIT"
+msgid "Requested tickets should be forwardable"
+msgstr "Los tiques solicitados deberán ser reenviables"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:11
-msgid "Prompt minutes before expiry"
-msgstr "Mostrar minutos antes de caducar"
+msgid "Renewable ticket"
+msgstr "Tique renovable"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:12
-msgid "Proxiable ticket"
-msgstr "Tique vía proxy"
+msgid "Requested tickets should be renewable"
+msgstr "Los tiques solicitados deberán ser renovables"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:13
-msgid "Renewable ticket"
-msgstr "Tique renovable"
+msgid "Proxiable ticket"
+msgstr "Tique vía proxy"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:14
-msgid "Requested tickets should be forwardable"
-msgstr "Los tiques solicitados deberán ser reenviables"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:15
 msgid "Requested tickets should be proxiable"
 msgstr "Los tiques solicitados deberán ser vía proxy"
 
+#: ../src/krb5-auth-dialog.schemas.in.h:15
+msgid "valid ticket notification"
+msgstr "tique de notificación válido"
+
 #: ../src/krb5-auth-dialog.schemas.in.h:16
-msgid "Requested tickets should be renewable"
-msgstr "Los tiques solicitados deberán ser renovables"
+msgid "Notify user when ticket becomes valid"
+msgstr "Notificar al usuario cuando un tique se convierta en válido"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:17
-msgid ""
-"Start prompting/displaying notifications that many minutes before expiry"
-msgstr "Dejar de mostrar notificaciones esos minutos antes de que caduque"
+msgid "ticket expiring notification"
+msgstr "notificación de caducidad de tique"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:18
-msgid "The kerberos principal to acquire the ticket for"
-msgstr "El principal de Kerberos para el que adquirir el tique"
+msgid "Notify user when ticket is about to expire"
+msgstr "Notificar al usuario cuando un tique va a caducar"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:19
-msgid "The principal's public/private/certificate identifier when using PKINIT"
-msgstr ""
-"El identificador público/privado/certificado del principal al usar PKINIT"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:20
 msgid "ticket expired notification"
 msgstr "notificación de tique caducado"
 
+#: ../src/krb5-auth-dialog.schemas.in.h:20
+msgid "Notify user when ticket has expired"
+msgstr "Notificar al usuario cuando un tique ha caducado"
+
 #: ../src/krb5-auth-dialog.schemas.in.h:21
-msgid "ticket expiring notification"
-msgstr "notificación de caducidad de tique"
+msgid "Enabled plugins"
+msgstr "Complementos activados"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:22
-msgid "valid ticket notification"
-msgstr "tique de notificación válido"
+msgid "List of plugins that should be loaded and activated on startup."
+msgstr "Lista de complementos que se debería cargar y activar al inicio."
 
 #: ../secmem/util.c:106
 #, c-format
 msgid "Warning: running q-agent setuid on this system is dangerous\n"
 msgstr "Advertencia: ejecutar q-agent setuid en este sistema es peligroso\n"
 
-#. Translators: those are keywords for the Kerberos authentication control-center panel
-#: ../cc-panel/gnome-ka-panel.desktop.in.h:3
-msgid "Kerberos;Authentication"
-msgstr "Kerberos;Autenticación"
-
-#: ../cc-panel/gnome-ka-panel.desktop.in.h:4
-msgid "Set your Kerberos network authentication preferences"
-msgstr "Establezca sus preferencias de autenticación de red en Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:1
-msgid "Certificate and private key used for authentication"
-msgstr "Certificado y clave privada usados para la autenticación"
+#~ msgid "There was an error launching the preferences dialog: %s"
+#~ msgstr "Hubo un error al lanzar el diálogo de preferencias: %s"
 
-#: ../cc-panel/ka-panel.ui.h:2
-msgid "Certificate used to verify digital signatures."
-msgstr "Certificado usado para comprobar firmas digitales."
+#~ msgid "Kerberos;Authentication"
+#~ msgstr "Kerberos;Autenticación"
 
-#: ../cc-panel/ka-panel.ui.h:3
-msgid ""
-"Configure the use of certificates and smartcards for your Kerberos network "
-"authentication."
-msgstr ""
-"Configurar el uso de certificados y tarjetas inteligentes para su "
-"autenticación de red de Kerberos."
-
-#: ../cc-panel/ka-panel.ui.h:4
-msgid "If checked, request forwardable tickets"
-msgstr "Si está seleccionado pide tiques reenviables"
-
-#: ../cc-panel/ka-panel.ui.h:5
-msgid "If checked, request proxiable tickets"
-msgstr "Si está seleccionado pide tiques vía proxy"
-
-#: ../cc-panel/ka-panel.ui.h:6
-msgid "If checked, request renewable tickets"
-msgstr "Si está seleccionado pide tiques renovables"
-
-#: ../cc-panel/ka-panel.ui.h:7
-msgid "If checked, use a security token (Smartcard) to authenticate."
-msgstr ""
-"Si está seleccionado usa un «token» (tarjeta inteligente) para autenticar."
-
-#: ../cc-panel/ka-panel.ui.h:8
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:9
-msgid "Kerberos Ticket Options"
-msgstr "Opciones del tique de Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:10
-msgid "Kerberos User"
-msgstr "Usuario de Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:11
-msgid "Kerberos principal:"
-msgstr "Principal de Kerberos:"
-
-#: ../cc-panel/ka-panel.ui.h:12
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#: ../cc-panel/ka-panel.ui.h:13
-msgid "PKINIT"
-msgstr "PKINIT"
-
-#: ../cc-panel/ka-panel.ui.h:14
-msgid "Requested Kerberos tickets should be:"
-msgstr "Los tiques solicitados a Kerberos deben ser:"
-
-#: ../cc-panel/ka-panel.ui.h:15
-msgid ""
-"Send notification about ticket expiry that many minutes before it finally "
-"expires"
-msgstr ""
-"Enviar notificación acerca de la caducidad del tique esos minutos antes de "
-"que caduque"
-
-#: ../cc-panel/ka-panel.ui.h:16
-msgid ""
-"The name of your Kerberos account. Leave blank to use your current username."
-msgstr ""
-"El nombre de su cuenta de Kerberos. Déjelo en blanco para usar su nombre de "
-"usuario actual."
-
-#: ../cc-panel/ka-panel.ui.h:17
-msgid "Use Smartcard"
-msgstr "Usar tarjeta inteligente"
-
-#: ../cc-panel/ka-panel.ui.h:18
-msgid "Userid"
-msgstr "ID de usuario"
-
-#. Used in combination: 'Warn x minutes before expiry'
-#: ../cc-panel/ka-panel.ui.h:20
-msgid "Warn"
-msgstr "Advertir"
-
-#: ../cc-panel/ka-panel.ui.h:21
-msgid "X509 trust anchors"
-msgstr "Anclas de confianza de X509"
-
-#: ../cc-panel/ka-panel.ui.h:22
-msgid "_Browse..."
-msgstr "_Examinar…"
-
-#: ../cc-panel/ka-panel.ui.h:23
-msgid "forwardable"
-msgstr "reenviable"
-
-#. Used in combination: 'Warn x minutes before expiry'
-#: ../cc-panel/ka-panel.ui.h:25
-msgid "minutes before ticket expiry"
-msgstr "minutos antes de que caduque el tique"
-
-#: ../cc-panel/ka-panel.ui.h:26
-msgid "proxiable"
-msgstr "vía proxy"
-
-#: ../cc-panel/ka-panel.ui.h:27
-msgid "renewable"
-msgstr "renovable"
-
-#: ../cc-panel/cc-ka-panel.c:345
-msgid "Choose Certificate"
-msgstr "Elija un certificado"
-
-#: ../cc-panel/cc-ka-panel.c:361
-msgid "X509 Certificates"
-msgstr "Certificados X509"
-
-#: ../cc-panel/cc-ka-panel.c:365
-msgid "all files"
-msgstr "todos los archivos"
+#~ msgid "Set your Kerberos network authentication preferences"
+#~ msgstr "Establezca sus preferencias de autenticación de red en Kerberos"
 
 #~| msgid "Network credentials valid"
 #~ msgid "Kerberos credentials valid"
diff --git a/po/fr.po b/po/fr.po
index 6dc0ca5..6f28c9b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: krb5-auth-dialog master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-"
 "auth-dialog&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-06 10:36+0000\n"
+"POT-Creation-Date: 2012-05-28 12:58+0000\n"
 "PO-Revision-Date: 2011-10-01 23:20+0200\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -20,157 +20,157 @@ msgstr ""
 "Content-Transfer-Encoding: 8 bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/krb5-auth-dialog.ui.h:1
-msgid "Certificate and private key used for authentication"
-msgstr "Certificat et clé privée utilisés pour l'authentification"
+#.
+#. * vim:ts:sts=4:sw=4:et:
+#.
+#: ../src/krb5-auth-dialog.ui.h:1 ../src/krb5-auth-dialog.desktop.in.h:1
+msgid "Kerberos Authentication"
+msgstr "Authentification de Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:2
-msgid "Certificate used to verify digital signatures."
-msgstr "Certificat utilisé pour vérifier les signatures numériques."
+msgid "_Renew Ticket"
+msgstr "_Renouveler le ticket"
 
 #: ../src/krb5-auth-dialog.ui.h:3
-msgid ""
-"Configure the use of certificates and smartcards for your Kerberos network "
-"authentication."
-msgstr ""
-"Configure l'utilisation de certificats et de cartes à puce pour "
-"l'authentification sur des réseaux Kerberos."
+msgid "Service Tickets"
+msgstr "Tickets de service"
 
 #: ../src/krb5-auth-dialog.ui.h:4
-msgid "If checked, request forwardable tickets"
-msgstr "Si coché, demande des tickets transférables"
+msgid "_File"
+msgstr "_Fichier"
 
 #: ../src/krb5-auth-dialog.ui.h:5
-msgid "If checked, request proxiable tickets"
-msgstr "Si coché, demande des tickets utilisables via proxy"
+msgid "_Edit"
+msgstr "É_dition"
 
 #: ../src/krb5-auth-dialog.ui.h:6
-msgid "If checked, request renewable tickets"
-msgstr "Si coché, demande des tickets renouvelables"
+msgid "_Help"
+msgstr "Aid_e"
 
 #: ../src/krb5-auth-dialog.ui.h:7
-msgid "If checked, use a security token (Smartcard) to authenticate."
-msgstr ""
-"Si coché, utilise un jeton de sécurité (carte à puce) pour "
-"l'authentification."
+msgid "Kerberos User"
+msgstr "Utilisateur Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:8
-msgid "Kerberos"
-msgstr "Kerberos"
+msgid ""
+"The name of your Kerberos account. Leave blank to use your current username."
+msgstr ""
+"Le nom de votre compte Kerberos. Laissez vide pour utiliser votre nom "
+"d'utilisateur actuel."
 
-#.
-#. * vim:ts:sts=4:sw=4:et:
-#.
-#: ../src/krb5-auth-dialog.ui.h:9 ../src/krb5-auth-dialog.desktop.in.h:1
-msgid "Kerberos Authentication"
-msgstr "Authentification de Kerberos"
+#: ../src/krb5-auth-dialog.ui.h:9
+msgid "Kerberos principal:"
+msgstr "Principal Kerberos :"
 
 #: ../src/krb5-auth-dialog.ui.h:10
 msgid "Kerberos Ticket Options"
 msgstr "Options des tickets Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:11
-msgid "Kerberos User"
-msgstr "Utilisateur Kerberos"
+msgid "Requested Kerberos tickets should be:"
+msgstr "Les tickets Kerberos demandés doivent être :"
 
 #: ../src/krb5-auth-dialog.ui.h:12
-msgid "Kerberos principal:"
-msgstr "Principal Kerberos :"
+msgid "forwardable"
+msgstr "transférables"
 
 #: ../src/krb5-auth-dialog.ui.h:13
-msgid "Notifications"
-msgstr "Notifications"
+msgid "If checked, request forwardable tickets"
+msgstr "Si coché, demande des tickets transférables"
 
 #: ../src/krb5-auth-dialog.ui.h:14
-msgid "PKINIT"
-msgstr "PKINIT"
+msgid "renewable"
+msgstr "renouvelables"
 
 #: ../src/krb5-auth-dialog.ui.h:15
-msgid "Requested Kerberos tickets should be:"
-msgstr "Les tickets Kerberos demandés doivent être :"
+msgid "If checked, request renewable tickets"
+msgstr "Si coché, demande des tickets renouvelables"
 
 #: ../src/krb5-auth-dialog.ui.h:16
-msgid ""
-"Send notification about ticket expiry that many minutes before it finally "
-"expires"
-msgstr ""
-"Envoyer une notification à propos de l'expiration d'un ticket tant de "
-"minutes avant qu'il n'expire"
+msgid "proxiable"
+msgstr "utilisables via proxy"
 
 #: ../src/krb5-auth-dialog.ui.h:17
-msgid "Service Tickets"
-msgstr "Tickets de service"
+msgid "If checked, request proxiable tickets"
+msgstr "Si coché, demande des tickets utilisables via proxy"
 
 #: ../src/krb5-auth-dialog.ui.h:18
-msgid ""
-"The name of your Kerberos account. Leave blank to use your current username."
-msgstr ""
-"Le nom de votre compte Kerberos. Laissez vide pour utiliser votre nom "
-"d'utilisateur actuel."
+msgid "Kerberos"
+msgstr "Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:19
+msgid "Userid"
+msgstr "Identifiant"
+
+#: ../src/krb5-auth-dialog.ui.h:20
 msgid "Use Smartcard"
 msgstr "Utiliser une carte à puce"
 
-#: ../src/krb5-auth-dialog.ui.h:20
-msgid "Userid"
-msgstr "Identifiant"
+#: ../src/krb5-auth-dialog.ui.h:21
+msgid "If checked, use a security token (Smartcard) to authenticate."
+msgstr ""
+"Si coché, utilise un jeton de sécurité (carte à puce) pour "
+"l'authentification."
 
-#. Used in combination: 'Warn x minutes before expiry'
 #: ../src/krb5-auth-dialog.ui.h:22
-msgid "Warn"
-msgstr "Avertir"
+msgid "Certificate and private key used for authentication"
+msgstr "Certificat et clé privée utilisés pour l'authentification"
 
 #: ../src/krb5-auth-dialog.ui.h:23
-msgid "X509 trust anchors"
-msgstr "Ancrages de confiance X509"
-
-#: ../src/krb5-auth-dialog.ui.h:24
 msgid "_Browse..."
 msgstr "_Parcourir..."
 
+#: ../src/krb5-auth-dialog.ui.h:24
+msgid "X509 trust anchors"
+msgstr "Ancrages de confiance X509"
+
 #: ../src/krb5-auth-dialog.ui.h:25
-msgid "_Edit"
-msgstr "É_dition"
+msgid "Certificate used to verify digital signatures."
+msgstr "Certificat utilisé pour vérifier les signatures numériques."
 
 #: ../src/krb5-auth-dialog.ui.h:26
-msgid "_File"
-msgstr "_Fichier"
+msgid ""
+"Configure the use of certificates and smartcards for your Kerberos network "
+"authentication."
+msgstr ""
+"Configure l'utilisation de certificats et de cartes à puce pour "
+"l'authentification sur des réseaux Kerberos."
 
 #: ../src/krb5-auth-dialog.ui.h:27
-msgid "_Help"
-msgstr "Aid_e"
+msgid "PKINIT"
+msgstr "PKINIT"
 
 #: ../src/krb5-auth-dialog.ui.h:28
-msgid "_Renew Ticket"
-msgstr "_Renouveler le ticket"
-
-#: ../src/krb5-auth-dialog.ui.h:29
-msgid "forwardable"
-msgstr "transférables"
+msgid "Notifications"
+msgstr "Notifications"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../src/krb5-auth-dialog.ui.h:31
-msgid "minutes before ticket expiry"
-msgstr "minutes avant l'expiration du ticket"
+#: ../src/krb5-auth-dialog.ui.h:30
+msgid "Warn"
+msgstr "Avertir"
 
-#: ../src/krb5-auth-dialog.ui.h:32
-msgid "proxiable"
-msgstr "utilisables via proxy"
+#: ../src/krb5-auth-dialog.ui.h:31
+msgid ""
+"Send notification about ticket expiry that many minutes before it finally "
+"expires"
+msgstr ""
+"Envoyer une notification à propos de l'expiration d'un ticket tant de "
+"minutes avant qu'il n'expire"
 
+#. Used in combination: 'Warn x minutes before expiry'
 #: ../src/krb5-auth-dialog.ui.h:33
-msgid "renewable"
-msgstr "renouvelables"
+msgid "minutes before ticket expiry"
+msgstr "minutes avant l'expiration du ticket"
 
-#: ../src/ka-dialog.c:177
+#: ../src/ka-kerberos.c:177
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: ../src/ka-dialog.c:317
+#: ../src/ka-kerberos.c:317
 msgid "Your ticket cache is currently empty"
 msgstr "Votre cache de tickets est actuellement vide"
 
-#: ../src/ka-dialog.c:343
+#: ../src/ka-kerberos.c:341
 msgid "Expired"
 msgstr "Expiré"
 
@@ -179,14 +179,14 @@ msgstr "Expiré"
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr "Impossible d'acquérir le ticket Kerberos : « %s »"
 
-#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:368
+#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:466
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
 msgstr[0] "Vos informations d'authentification vont expirer dans %d minute"
 msgstr[1] "Vos informations d'authentification vont expirer dans %d minutes"
 
-#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:373
+#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:471
 msgid "Your credentials have expired"
 msgstr "Vos informations d'authentification ont expiré."
 
@@ -1535,57 +1535,57 @@ msgstr "Numéro magique GSSAPI OID incorrect"
 msgid "Bad magic number for GSSAPI QUEUE"
 msgstr "Numéro magique GSSAPI QUEUE incorrect"
 
-#: ../src/ka-applet.c:362
+#: ../src/ka-applet.c:460
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "Vos informations d'authentification expirent dans %.2d h %.2d"
 
-#: ../src/ka-applet.c:544
+#: ../src/ka-applet.c:642
 msgid "List Tickets"
 msgstr "Énumérer les tickets"
 
-#: ../src/ka-applet.c:554
+#: ../src/ka-applet.c:652
 msgid "Get Ticket"
 msgstr "Obtenir le ticket"
 
-#: ../src/ka-applet.c:563
+#: ../src/ka-applet.c:661
 msgid "Don't show me this again"
 msgstr "Ne plus afficher"
 
-#: ../src/ka-applet.c:570
+#: ../src/ka-applet.c:668
 msgid "Remove Credentials Cache"
 msgstr "Supprimer le cache des informations d'authentification"
 
-#: ../src/ka-applet.c:619
+#: ../src/ka-applet.c:717
 msgid "You have valid Kerberos credentials."
 msgstr "Vos informations d'authentification Kerberos sont valides."
 
-#: ../src/ka-applet.c:621
+#: ../src/ka-applet.c:719
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Vous avez actualisé vos informations d'authentification Kerberos."
 
-#: ../src/ka-applet.c:624
+#: ../src/ka-applet.c:722
 msgid "Network credentials valid"
 msgstr "Informations d'authentification réseau valides"
 
-#: ../src/ka-applet.c:643
+#: ../src/ka-applet.c:741
 msgid "Network credentials expiring"
 msgstr "Informations d'authentification Kerberos en cours d'expiration"
 
-#: ../src/ka-applet.c:661
+#: ../src/ka-applet.c:759
 msgid "Network credentials expired"
 msgstr "Informations d'authentification réseau expirées"
 
-#: ../src/ka-applet.c:662
-msgid "Your Kerberos credentails have expired."
+#: ../src/ka-applet.c:760
+msgid "Your Kerberos credentials have expired."
 msgstr "Vos informations d'authentification Kerberos ont expiré."
 
-#: ../src/ka-applet.c:741
+#: ../src/ka-applet.c:839
 msgid "Remove Credentials _Cache"
 msgstr "Supprimer le _cache des informations d'authentification"
 
 #. Ticket dialog
-#: ../src/ka-applet.c:751
+#: ../src/ka-applet.c:849
 msgid "_List Tickets"
 msgstr "É_numérer les tickets"
 
@@ -1617,19 +1617,22 @@ msgstr "Heure de début"
 msgid "End Time"
 msgstr "Heure de fin"
 
-#: ../src/ka-main-window.c:137
+#. Translators: this is an abbreviation for forwardable
+#: ../src/ka-main-window.c:138
 msgid "Fwd"
 msgstr "Transfert"
 
-#: ../src/ka-main-window.c:143
+#. Translators: this is an abbreviation for proxiable
+#: ../src/ka-main-window.c:145
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/ka-main-window.c:149
+#. Translators: this is an abbreviation for renewable
+#: ../src/ka-main-window.c:152
 msgid "Renew"
 msgstr "Renouvellement"
 
-#: ../src/ka-main-window.c:176
+#: ../src/ka-main-window.c:179
 msgid "Error displaying service ticket information"
 msgstr "Erreur lors de l'affichage des informations du ticket de service"
 
@@ -1650,97 +1653,97 @@ msgid "Kerberos Network Authentication Dialog"
 msgstr "Boîte de dialogue d'authentification réseau Kerberos"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:1
-msgid "Enabled plugins"
-msgstr "Greffons actifs"
+msgid "Kerberos principal"
+msgstr "Principal Kerberos"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:2
-msgid "Forwardable ticket"
-msgstr "Ticket transférable"
+msgid "The kerberos principal to acquire the ticket for"
+msgstr "Le principal Kerberos pour lequel obtenir le ticket"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:3
-msgid "Kerberos principal"
-msgstr "Principal Kerberos"
+msgid "PKINIT identifier"
+msgstr "Identifiant PKINIT"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:4
-msgid "List of plugins that should be loaded and activated on startup."
-msgstr "Liste de greffons qui sont chargés et activés au démarrage."
+msgid "The principal's public/private/certificate identifier when using PKINIT"
+msgstr ""
+"L'identifiant publique/privé/certificat du principal lors de l'utilisation "
+"de PKINIT"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:5
-msgid "Notify user when ticket becomes valid"
-msgstr "Avertir l'utilisateur lorsque le ticket devient valide"
+msgid "PKINIT trust anchors"
+msgstr "Ancrages de confiance PKINIT"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:6
-msgid "Notify user when ticket has expired"
-msgstr "Avertir l'utilisateur lorsque le ticket a expiré"
+msgid "PKINIT CA certificates"
+msgstr "Certificats CA PKINIT"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:7
-msgid "Notify user when ticket is about to expire"
-msgstr "Avertir l'utilisateur lorsque le ticket est sur le point d'expirer"
+msgid "Prompt minutes before expiry"
+msgstr "Avertir n minutes avant l'expiration"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:8
-msgid "PKINIT CA certificates"
-msgstr "Certificats CA PKINIT"
+msgid ""
+"Start prompting/displaying notifications that many minutes before expiry"
+msgstr ""
+"Commencer à demander/afficher des notifications tant de minutes avant "
+"l'expiration"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:9
-msgid "PKINIT identifier"
-msgstr "Identifiant PKINIT"
+msgid "Forwardable ticket"
+msgstr "Ticket transférable"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:10
-msgid "PKINIT trust anchors"
-msgstr "Ancrages de confiance PKINIT"
+msgid "Requested tickets should be forwardable"
+msgstr "Les tickets demandés doivent être transférables"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:11
-msgid "Prompt minutes before expiry"
-msgstr "Avertir n minutes avant l'expiration"
+msgid "Renewable ticket"
+msgstr "Ticket renouvelable"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:12
-msgid "Proxiable ticket"
-msgstr "Ticket utilisable via proxy"
+msgid "Requested tickets should be renewable"
+msgstr "Les tickets demandés doivent être renouvelables"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:13
-msgid "Renewable ticket"
-msgstr "Ticket renouvelable"
+msgid "Proxiable ticket"
+msgstr "Ticket utilisable via proxy"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:14
-msgid "Requested tickets should be forwardable"
-msgstr "Les tickets demandés doivent être transférables"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:15
 msgid "Requested tickets should be proxiable"
 msgstr "Les tickets demandés doivent être utilisables au travers d'un proxy"
 
+#: ../src/krb5-auth-dialog.schemas.in.h:15
+msgid "valid ticket notification"
+msgstr "Notification de ticket valide"
+
 #: ../src/krb5-auth-dialog.schemas.in.h:16
-msgid "Requested tickets should be renewable"
-msgstr "Les tickets demandés doivent être renouvelables"
+msgid "Notify user when ticket becomes valid"
+msgstr "Avertir l'utilisateur lorsque le ticket devient valide"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:17
-msgid ""
-"Start prompting/displaying notifications that many minutes before expiry"
-msgstr ""
-"Commencer à demander/afficher des notifications tant de minutes avant "
-"l'expiration"
+msgid "ticket expiring notification"
+msgstr "Notification de ticket en cours d'expiration"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:18
-msgid "The kerberos principal to acquire the ticket for"
-msgstr "Le principal Kerberos pour lequel obtenir le ticket"
+msgid "Notify user when ticket is about to expire"
+msgstr "Avertir l'utilisateur lorsque le ticket est sur le point d'expirer"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:19
-msgid "The principal's public/private/certificate identifier when using PKINIT"
-msgstr ""
-"L'identifiant publique/privé/certificat du principal lors de l'utilisation "
-"de PKINIT"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:20
 msgid "ticket expired notification"
 msgstr "Notification de ticket expiré"
 
+#: ../src/krb5-auth-dialog.schemas.in.h:20
+msgid "Notify user when ticket has expired"
+msgstr "Avertir l'utilisateur lorsque le ticket a expiré"
+
 #: ../src/krb5-auth-dialog.schemas.in.h:21
-msgid "ticket expiring notification"
-msgstr "Notification de ticket en cours d'expiration"
+msgid "Enabled plugins"
+msgstr "Greffons actifs"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:22
-msgid "valid ticket notification"
-msgstr "Notification de ticket valide"
+msgid "List of plugins that should be loaded and activated on startup."
+msgstr "Liste de greffons qui sont chargés et activés au démarrage."
 
 #: ../secmem/util.c:106
 #, c-format
diff --git a/po/gl.po b/po/gl.po
index 9a0c82b..8923777 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,44 +5,173 @@
 # 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@gnome.org>, 2010, 2011.
+# Fran Dieguez <frandieguez@gnome.org>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: krb5-auth-dialog.po.master.gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-16 22:57+0200\n"
-"PO-Revision-Date: 2011-08-16 23:00+0200\n"
-"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
+"POT-Creation-Date: 2012-08-30 14:41+0200\n"
+"PO-Revision-Date: 2012-08-30 14:41+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\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"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
+#.
+#. * vim:ts:sts=4:sw=4:et:
+#.
 #: ../src/krb5-auth-dialog.ui.h:1 ../src/krb5-auth-dialog.desktop.in.h:1
-#: ../cc-panel/gnome-ka-panel.desktop.in.h:1
 msgid "Kerberos Authentication"
 msgstr "Configuración de autenticación de Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:2
+msgid "_Renew Ticket"
+msgstr "_Anovar tícket"
+
+#: ../src/krb5-auth-dialog.ui.h:3
 msgid "Service Tickets"
 msgstr "Tiquets de servicio"
 
-#: ../src/krb5-auth-dialog.ui.h:3
-msgid "_Renew Ticket"
-msgstr "_Anovar tícket"
+#: ../src/krb5-auth-dialog.ui.h:4
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: ../src/krb5-auth-dialog.ui.h:5
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../src/krb5-auth-dialog.ui.h:6
+msgid "_Help"
+msgstr "_Axuda"
+
+#: ../src/krb5-auth-dialog.ui.h:7
+msgid "Kerberos User"
+msgstr "Usuario de Kerberos"
+
+#: ../src/krb5-auth-dialog.ui.h:8
+msgid ""
+"The name of your Kerberos account. Leave blank to use your current username."
+msgstr ""
+"O nome da súa conta de Kerberos. Déixeo en branco para usar o seu nome de "
+"usuario actual."
+
+#: ../src/krb5-auth-dialog.ui.h:9
+msgid "Kerberos principal:"
+msgstr "Principal de Kerberos:"
+
+#: ../src/krb5-auth-dialog.ui.h:10
+msgid "Kerberos Ticket Options"
+msgstr "Opcións do tique de Kerberos"
+
+#: ../src/krb5-auth-dialog.ui.h:11
+msgid "Requested Kerberos tickets should be:"
+msgstr "Os tíckets solicitados a Kerberos deberían ser:"
+
+#: ../src/krb5-auth-dialog.ui.h:12
+msgid "forwardable"
+msgstr "reenviábel"
+
+#: ../src/krb5-auth-dialog.ui.h:13
+msgid "If checked, request forwardable tickets"
+msgstr "Se está seleccionado, pide tíckets reenviábeis"
+
+#: ../src/krb5-auth-dialog.ui.h:14
+msgid "renewable"
+msgstr "renovábel"
+
+#: ../src/krb5-auth-dialog.ui.h:15
+msgid "If checked, request renewable tickets"
+msgstr "Se está seleccionado pide tíckets anovábeis"
+
+#: ../src/krb5-auth-dialog.ui.h:16
+msgid "proxiable"
+msgstr "vía proxy"
+
+#: ../src/krb5-auth-dialog.ui.h:17
+msgid "If checked, request proxiable tickets"
+msgstr "Se está seleccionado, solicita tíckets utilizábeis vía proxy"
+
+#: ../src/krb5-auth-dialog.ui.h:18
+msgid "Kerberos"
+msgstr "Kerberos"
+
+#: ../src/krb5-auth-dialog.ui.h:19
+msgid "Userid"
+msgstr "Id de usuario"
+
+#: ../src/krb5-auth-dialog.ui.h:20
+msgid "Use Smartcard"
+msgstr "Empregar Smartcard"
+
+#: ../src/krb5-auth-dialog.ui.h:21
+msgid "If checked, use a security token (Smartcard) to authenticate."
+msgstr ""
+"Se está activado emprega un token de seguranza (Smartcard) para autenticar."
+
+#: ../src/krb5-auth-dialog.ui.h:22
+msgid "Certificate and private key used for authentication"
+msgstr "Certificado e chave privada empregada para a autenticación"
+
+#: ../src/krb5-auth-dialog.ui.h:23
+msgid "_Browse..."
+msgstr "_Explorar..."
+
+#: ../src/krb5-auth-dialog.ui.h:24
+msgid "X509 trust anchors"
+msgstr "Áncoras de confianza de X509"
+
+#: ../src/krb5-auth-dialog.ui.h:25
+msgid "Certificate used to verify digital signatures."
+msgstr "Certificado usado para comprobar firmas dixitais."
+
+#: ../src/krb5-auth-dialog.ui.h:26
+msgid ""
+"Configure the use of certificates and smartcards for your Kerberos network "
+"authentication."
+msgstr ""
+"Configurar o uso do certificados e tarxeta intelixentes para a súa "
+"autenticación de rede de Kerberos."
+
+#: ../src/krb5-auth-dialog.ui.h:27
+msgid "PKINIT"
+msgstr "PKINIT"
+
+#: ../src/krb5-auth-dialog.ui.h:28
+msgid "Notifications"
+msgstr "Notificacións"
+
+#. Used in combination: 'Warn x minutes before expiry'
+#: ../src/krb5-auth-dialog.ui.h:30
+msgid "Warn"
+msgstr "Advertir"
+
+#: ../src/krb5-auth-dialog.ui.h:31
+msgid ""
+"Send notification about ticket expiry that many minutes before it finally "
+"expires"
+msgstr ""
+"Enviar notificación sobre a caducidade do tícket neses minutos antes de que "
+"caduque"
+
+#. Used in combination: 'Warn x minutes before expiry'
+#: ../src/krb5-auth-dialog.ui.h:33
+msgid "minutes before ticket expiry"
+msgstr "minutos antes de que caduque o tique"
 
-#: ../src/ka-dialog.c:177
+#: ../src/ka-kerberos.c:177
 msgid "unknown error"
 msgstr "erro descoñecido"
 
-#: ../src/ka-dialog.c:317
+#: ../src/ka-kerberos.c:317
 msgid "Your ticket cache is currently empty"
 msgstr "A súa caché de tiques está baleira actualmente"
 
-#: ../src/ka-dialog.c:343
+#: ../src/ka-kerberos.c:341
 msgid "Expired"
 msgstr "Caducado"
 
@@ -51,14 +180,14 @@ msgstr "Caducado"
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr "No se puido obter o tícket de Kerberos: '%s'"
 
-#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:361
+#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:466
 #, 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/ka-pwdialog.c:222 ../src/ka-applet.c:366
+#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:471
 msgid "Your credentials have expired"
 msgstr "As súas credenciais caducaron"
 
@@ -1395,69 +1524,57 @@ msgstr "Número máxico incorrecto para a estrutura GSSAPI OID"
 msgid "Bad magic number for GSSAPI QUEUE"
 msgstr "Número máxico incorrecto para GSSAPI QUEUE"
 
-#: ../src/ka-applet.c:355
+#: ../src/ka-applet.c:460
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "As súas credenciais caducan en %.2d:%.2dh"
 
-#: ../src/ka-applet.c:537
+#: ../src/ka-applet.c:642
 msgid "List Tickets"
 msgstr "Listar tiques"
 
-#: ../src/ka-applet.c:547
+#: ../src/ka-applet.c:652
 msgid "Get Ticket"
 msgstr "Obter tique"
 
-#: ../src/ka-applet.c:556
+#: ../src/ka-applet.c:661
 msgid "Don't show me this again"
 msgstr "Non mostrar esta mensaxe de novo"
 
-#: ../src/ka-applet.c:563
+#: ../src/ka-applet.c:668
 msgid "Remove Credentials Cache"
 msgstr "Quitar a caché de credenciais"
 
-#: ../src/ka-applet.c:612
+#: ../src/ka-applet.c:717
 msgid "You have valid Kerberos credentials."
 msgstr "As súas credenciais de Kerberos son válidas."
 
-#: ../src/ka-applet.c:614
+#: ../src/ka-applet.c:719
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Actualizou as súas credenciais Kerberos."
 
-#: ../src/ka-applet.c:617
+#: ../src/ka-applet.c:722
 msgid "Network credentials valid"
 msgstr "As credenciais de rede son válidas"
 
-#: ../src/ka-applet.c:636
+#: ../src/ka-applet.c:741
 msgid "Network credentials expiring"
 msgstr "As credenciais de rede van caducar"
 
-#: ../src/ka-applet.c:654
+#: ../src/ka-applet.c:759
 msgid "Network credentials expired"
 msgstr "As credenciais de rede caducaron"
 
-#: ../src/ka-applet.c:655
-msgid "Your Kerberos credentails have expired."
-msgstr "As súas credenciais Kerberos caducaron."
+#: ../src/ka-applet.c:760
+msgid "Your Kerberos credentials have expired."
+msgstr "As súas credenciais de Kerberos caducaron."
 
-#: ../src/ka-applet.c:699
-#, c-format
-msgid "There was an error launching the preferences dialog: %s"
-msgstr "Produciuse un erro ao iniciar o diálogo de preferencias: %s"
-
-#. Translators: add the translators of your language here
-#: ../src/ka-applet.c:745
-msgid "translator-credits"
-msgstr ""
-"Antón Méixome <meixome@mancomun.org> para Mancomún. Centro de Referencia de "
-"Software Libre "
-
-#: ../src/ka-applet.c:790
+#: ../src/ka-applet.c:839
 msgid "Remove Credentials _Cache"
 msgstr "Quitar a _caché de credenciais"
 
 #. Ticket dialog
-#: ../src/ka-applet.c:800
+#: ../src/ka-applet.c:849
 msgid "_List Tickets"
 msgstr "_Listar tiques"
 
@@ -1470,267 +1587,164 @@ msgstr ""
 "Ocorreu un erro ao mostrar a axuda:\n"
 "%s"
 
-#: ../src/ka-tickets.c:56
+#. Translators: add the translators of your language here
+#: ../src/ka-tools.c:83
+msgid "translator-credits"
+msgstr ""
+"Antón Méixome <meixome@mancomun.org> para Mancomún. Centro de Referencia de "
+"Software Libre "
+
+#: ../src/ka-main-window.c:119
 msgid "Principal"
 msgstr "Principal"
 
-#: ../src/ka-tickets.c:62
+#: ../src/ka-main-window.c:125
 msgid "Start Time"
 msgstr "Tempo de inicio"
 
-#: ../src/ka-tickets.c:68
+#: ../src/ka-main-window.c:131
 msgid "End Time"
 msgstr "Tempo de finalización"
 
-#: ../src/ka-tickets.c:74
+#. Translators: this is an abbreviation for forwardable
+#: ../src/ka-main-window.c:138
 msgid "Fwd"
 msgstr "Rnv"
 
-#: ../src/ka-tickets.c:80
+#. Translators: this is an abbreviation for proxiable
+#: ../src/ka-main-window.c:145
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/ka-tickets.c:86
+#. Translators: this is an abbreviation for renewable
+#: ../src/ka-main-window.c:152
 msgid "Renew"
 msgstr "Renovar"
 
-#: ../src/ka-tickets.c:109
+#: ../src/ka-main-window.c:179
 msgid "Error displaying service ticket information"
 msgstr "Produciuse un erro ao mostrar a información do tiquet de servizo"
 
+#: ../src/ka-preferences.c:340
+msgid "Choose Certificate"
+msgstr "Seleccione o certificado"
+
+#: ../src/ka-preferences.c:356
+msgid "X509 Certificates"
+msgstr "Certificados X509"
+
+#: ../src/ka-preferences.c:360
+msgid "all files"
+msgstr "todos os ficheiros"
+
 #: ../src/krb5-auth-dialog.desktop.in.h:2
 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"
+msgid "Kerberos principal"
+msgstr "Principal de Kerberos"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:2
-msgid "Forwardable ticket"
-msgstr "Tícket reenviábel"
+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:3
-msgid "Kerberos principal"
-msgstr "Principal de Kerberos"
+msgid "PKINIT identifier"
+msgstr "Identificador PKINT"
 
 #: ../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."
+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:5
-msgid "Notify user when ticket becomes valid"
-msgstr "Notificarlle ao usuario cando un tícket se convirta en válido"
+msgid "PKINIT trust anchors"
+msgstr "Áncoras de confianza de PKINIT"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:6
-msgid "Notify user when ticket has expired"
-msgstr "Notificarlle ao usuario cando un tícket caducou"
+msgid "PKINIT CA certificates"
+msgstr "Certificados PKINIT CA"
 
 #: ../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"
+msgid "Prompt minutes before expiry"
+msgstr "Mostrar minutos antes de caducar"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:8
-msgid "PKINIT CA certificates"
-msgstr "Certificados PKINIT CA"
+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:9
-msgid "PKINIT identifier"
-msgstr "Identificador PKINT"
+msgid "Forwardable ticket"
+msgstr "Tícket reenviábel"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:10
-msgid "PKINIT trust anchors"
-msgstr "Áncoras de confianza de PKINIT"
+msgid "Requested tickets should be forwardable"
+msgstr "Os tíckets solicitados deberán ser reenviábeis"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:11
-msgid "Prompt minutes before expiry"
-msgstr "Mostrar minutos antes de caducar"
+msgid "Renewable ticket"
+msgstr "Tícket anovábel"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:12
-msgid "Proxiable ticket"
-msgstr "Tícket utilizábel vía proxy"
+msgid "Requested tickets should be renewable"
+msgstr "Os tíckets solicitados deberían ser anovábeis"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:13
-msgid "Renewable ticket"
-msgstr "Tícket anovábel"
+msgid "Proxiable ticket"
+msgstr "Tícket utilizábel vía proxy"
 
 #: ../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: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:15
+msgid "valid ticket notification"
+msgstr "tícket de notificación válido"
+
 #: ../src/krb5-auth-dialog.schemas.in.h:16
-msgid "Requested tickets should be renewable"
-msgstr "Os tíckets solicitados deberían ser anovábeis"
+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:17
-msgid ""
-"Start prompting/displaying notifications that many minutes before expiry"
-msgstr "Deixar de mostrar notificacións eses minutos antes de que caduque"
+msgid "ticket expiring notification"
+msgstr "notificación de caducidade de tícket"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:18
-msgid "The kerberos principal to acquire the ticket for"
-msgstr "O principal de Kerberos para o que adquirir o tícket"
+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:19
-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
 msgid "ticket expired notification"
 msgstr "notificación de tícket caducado"
 
+#: ../src/krb5-auth-dialog.schemas.in.h:20
+msgid "Notify user when ticket has expired"
+msgstr "Notificarlle ao usuario cando un tícket caducou"
+
 #: ../src/krb5-auth-dialog.schemas.in.h:21
-msgid "ticket expiring notification"
-msgstr "notificación de caducidade de tícket"
+msgid "Enabled plugins"
+msgstr "Engadidos activados"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:22
-msgid "valid ticket notification"
-msgstr "tícket de notificación válido"
+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."
 
 #: ../secmem/util.c:106
 #, c-format
 msgid "Warning: running q-agent setuid on this system is dangerous\n"
 msgstr "Advertencia: executar q-agent setuid neste sistema é perigoso\n"
 
-#. Translators: those are keywords for the Kerberos authentication control-center panel
-#: ../cc-panel/gnome-ka-panel.desktop.in.h:3
-msgid "Kerberos;Authentication"
-msgstr "Kerberos;Autenticación"
+#~ msgid "There was an error launching the preferences dialog: %s"
+#~ msgstr "Produciuse un erro ao iniciar o diálogo de preferencias: %s"
 
-#: ../cc-panel/gnome-ka-panel.desktop.in.h:4
-msgid "Set your Kerberos network authentication preferences"
-msgstr "Estabeleza as súas preferencias de autenticación de rede en Kerberos"
+#~ msgid "Kerberos;Authentication"
+#~ msgstr "Kerberos;Autenticación"
 
-#: ../cc-panel/ka-panel.ui.h:1
-msgid "Certificate and private key used for authentication"
-msgstr "Certificado e chave privada empregada para a autenticación"
-
-#: ../cc-panel/ka-panel.ui.h:2
-msgid "Certificate used to verify digital signatures."
-msgstr "Certificado usado para comprobar firmas dixitais."
-
-#: ../cc-panel/ka-panel.ui.h:3
-msgid ""
-"Configure the use of certificates and smartcards for your Kerberos network "
-"authentication."
-msgstr ""
-"Configurar o uso do certificados e tarxeta intelixentes para a súa "
-"autenticación de rede de Kerberos."
-
-#: ../cc-panel/ka-panel.ui.h:4
-msgid "If checked, request forwardable tickets"
-msgstr "Se está seleccionado, pide tíckets reenviábeis"
-
-#: ../cc-panel/ka-panel.ui.h:5
-msgid "If checked, request proxiable tickets"
-msgstr "Se está seleccionado, solicita tíckets utilizábeis vía proxy"
-
-#: ../cc-panel/ka-panel.ui.h:6
-msgid "If checked, request renewable tickets"
-msgstr "Se está seleccionado pide tíckets anovábeis"
-
-#: ../cc-panel/ka-panel.ui.h:7
-msgid "If checked, use a security token (Smartcard) to authenticate."
-msgstr ""
-"Se está activado emprega un token de seguranza (Smartcard) para autenticar."
-
-#: ../cc-panel/ka-panel.ui.h:8
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:9
-msgid "Kerberos Ticket Options"
-msgstr "Opcións do tique de Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:10
-msgid "Kerberos User"
-msgstr "Usuario de Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:11
-msgid "Kerberos principal:"
-msgstr "Principal de Kerberos:"
-
-#: ../cc-panel/ka-panel.ui.h:12
-msgid "Notifications"
-msgstr "Notificacións"
-
-#: ../cc-panel/ka-panel.ui.h:13
-msgid "PKINIT"
-msgstr "PKINIT"
-
-#: ../cc-panel/ka-panel.ui.h:14
-msgid "Requested Kerberos tickets should be:"
-msgstr "Os tíckets solicitados a Kerberos deberían ser:"
-
-#: ../cc-panel/ka-panel.ui.h:15
-msgid ""
-"Send notification about ticket expiry that many minutes before it finally "
-"expires"
-msgstr ""
-"Enviar notificación sobre a caducidade do tícket neses minutos antes de que "
-"caduque"
-
-#: ../cc-panel/ka-panel.ui.h:16
-msgid ""
-"The name of your Kerberos account. Leave blank to use your current username."
-msgstr ""
-"O nome da súa conta de Kerberos. Déixeo en branco para usar o seu nome de "
-"usuario actual."
-
-#: ../cc-panel/ka-panel.ui.h:17
-msgid "Use Smartcard"
-msgstr "Empregar Smartcard"
-
-#: ../cc-panel/ka-panel.ui.h:18
-msgid "Userid"
-msgstr "Id de usuario"
-
-#. Used in combination: 'Warn x minutes before expiry'
-#: ../cc-panel/ka-panel.ui.h:20
-msgid "Warn"
-msgstr "Advertir"
-
-#: ../cc-panel/ka-panel.ui.h:21
-msgid "X509 trust anchors"
-msgstr "Áncoras de confianza de X509"
-
-#: ../cc-panel/ka-panel.ui.h:22
-msgid "_Browse..."
-msgstr "_Explorar..."
-
-#: ../cc-panel/ka-panel.ui.h:23
-msgid "forwardable"
-msgstr "reenviábel"
-
-#. Used in combination: 'Warn x minutes before expiry'
-#: ../cc-panel/ka-panel.ui.h:25
-msgid "minutes before ticket expiry"
-msgstr "minutos antes de que caduque o tique"
-
-#: ../cc-panel/ka-panel.ui.h:26
-msgid "proxiable"
-msgstr "vía proxy"
-
-#: ../cc-panel/ka-panel.ui.h:27
-msgid "renewable"
-msgstr "renovábel"
-
-#: ../cc-panel/cc-ka-panel.c:345
-msgid "Choose Certificate"
-msgstr "Seleccione o certificado"
-
-#: ../cc-panel/cc-ka-panel.c:361
-msgid "X509 Certificates"
-msgstr "Certificados X509"
-
-#: ../cc-panel/cc-ka-panel.c:365
-msgid "all files"
-msgstr "todos os ficheiros"
+#~ msgid "Set your Kerberos network authentication preferences"
+#~ msgstr ""
+#~ "Estabeleza as súas preferencias de autenticación de rede en Kerberos"
 
 #~ msgid "Network Authentication"
 #~ msgstr "Autenticación de rede"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 96a78e1..b0201a2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,75 +1,208 @@
 # Brazilian Portuguese translation for krb5-auth-dialog.
-# Copyright (C) 2010 krb5-auth-dialog's COPYRIGHT HOLDER
+# Copyright (C) 2013 krb5-auth-dialog's COPYRIGHT HOLDER
 # This file is distributed under the same license as the krb5-auth-dialog package.
 # Djavan Fagundes <djavan@comum.org>, 2010.
 # Djavan Fagundes <djavan@syst.com.br>, 2010.
+# Enrico Nicoletto <liverig@gmail.com>, 2013.
+#
 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-11-09 20:06+0000\n"
-"PO-Revision-Date: 2010-12-20 11:53-0200\n"
-"Last-Translator: Djavan Fagundes <djavan@syst.com.br>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-"
+"auth-dialog&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-03-16 16:10+0000\n"
+"PO-Revision-Date: 2013-03-16 13:58-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\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: Virtaal 0.6.1\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: ../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 "Autenticação da rede"
+#.
+#. * vim:ts:sts=4:sw=4:et:
+#.
+#: ../src/krb5-auth-dialog.ui.h:1 ../src/krb5-auth-dialog.desktop.in.h:1
+msgid "Kerberos Authentication"
+msgstr "Autenticação do Kerberos"
 
-#: ../src/krb5-auth-dialog.xml.h:2
+#: ../src/krb5-auth-dialog.ui.h:2
+msgid "_Renew Ticket"
+msgstr "_Renovar tíquete"
+
+#: ../src/krb5-auth-dialog.ui.h:3
 msgid "Service Tickets"
-msgstr "Serviço de tickets"
+msgstr "Serviço de tíquetes"
 
-#: ../src/krb5-auth-dialog.xml.h:3
-msgid "_Renew Ticket"
-msgstr "_Renovar ticket"
+#: ../src/krb5-auth-dialog.ui.h:4
+msgid "_File"
+msgstr "_Arquivo"
+
+#: ../src/krb5-auth-dialog.ui.h:5
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../src/krb5-auth-dialog.ui.h:6
+msgid "_Help"
+msgstr "A_juda"
+
+#: ../src/krb5-auth-dialog.ui.h:7
+msgid "Kerberos User"
+msgstr "Usuário do Kerberos"
+
+#: ../src/krb5-auth-dialog.ui.h:8
+msgid ""
+"The name of your Kerberos account. Leave blank to use your current username."
+msgstr ""
+"A nome da sua conta Kerberos. Deixe em branco para usar seu nome de usuário "
+"atual."
+
+#: ../src/krb5-auth-dialog.ui.h:9
+msgid "Kerberos principal:"
+msgstr "Principal do Kerberos:"
 
-#: ../src/ka-dialog.c:171
+#: ../src/krb5-auth-dialog.ui.h:10
+msgid "Kerberos Ticket Options"
+msgstr "Opções de tíquete Kerberos"
+
+#: ../src/krb5-auth-dialog.ui.h:11
+msgid "Requested Kerberos tickets should be:"
+msgstr "Os tíquetes requisitados do Kerberos devem ser:"
+
+#: ../src/krb5-auth-dialog.ui.h:12
+msgid "forwardable"
+msgstr "encaminhável"
+
+#: ../src/krb5-auth-dialog.ui.h:13
+msgid "If checked, request forwardable tickets"
+msgstr "Se definido, solicita tíquetes encaminháveis"
+
+#: ../src/krb5-auth-dialog.ui.h:14
+msgid "renewable"
+msgstr "renovável"
+
+#: ../src/krb5-auth-dialog.ui.h:15
+msgid "If checked, request renewable tickets"
+msgstr "Se marcado, solicita tíquetes renováveis"
+
+#: ../src/krb5-auth-dialog.ui.h:16
+msgid "proxiable"
+msgstr "apto a trabalhar com proxy"
+
+#: ../src/krb5-auth-dialog.ui.h:17
+msgid "If checked, request proxiable tickets"
+msgstr "Se marcado, solicita tíquetes aptos a trabalhar com proxy"
+
+#: ../src/krb5-auth-dialog.ui.h:18
+msgid "Kerberos"
+msgstr "Kerberos"
+
+#: ../src/krb5-auth-dialog.ui.h:19
+msgid "Userid"
+msgstr "Id do usuário"
+
+#: ../src/krb5-auth-dialog.ui.h:20
+msgid "Use Smartcard"
+msgstr "Usar Smartcard"
+
+#: ../src/krb5-auth-dialog.ui.h:21
+msgid "If checked, use a security token (Smartcard) to authenticate."
+msgstr "Se marcado, usa o token de segurança (Smartcard) para autenticar."
+
+#: ../src/krb5-auth-dialog.ui.h:22
+msgid "Certificate and private key used for authentication"
+msgstr "Certificado e chave privada usada para autenticação"
+
+#: ../src/krb5-auth-dialog.ui.h:23
+msgid "_Browse..."
+msgstr "_Navegar..."
+
+#: ../src/krb5-auth-dialog.ui.h:24
+msgid "X509 trust anchors"
+msgstr "Âncoras confiáveis X509"
+
+#: ../src/krb5-auth-dialog.ui.h:25
+msgid "Certificate used to verify digital signatures."
+msgstr "Certificado usado para verificar assinaturas digitais."
+
+#: ../src/krb5-auth-dialog.ui.h:26
+msgid ""
+"Configure the use of certificates and smartcards for your Kerberos network "
+"authentication."
+msgstr ""
+"Configura a utilização de certificados e cartões inteligentes para "
+"autenticação de sua rede Kerberos."
+
+#: ../src/krb5-auth-dialog.ui.h:27
+msgid "PKINIT"
+msgstr "PKINIT"
+
+#: ../src/krb5-auth-dialog.ui.h:28
+msgid "Notifications"
+msgstr "Notificações"
+
+#. Used in combination: 'Warn x minutes before expiry'
+#: ../src/krb5-auth-dialog.ui.h:30
+msgid "Warn"
+msgstr "Aviso"
+
+#: ../src/krb5-auth-dialog.ui.h:31
+msgid ""
+"Send notification about ticket expiry that many minutes before it finally "
+"expires"
+msgstr ""
+"Envia notificações sobre expiração de tíquetes minutos antes de finalmente "
+"expirar"
+
+#. Used in combination: 'Warn x minutes before expiry'
+#: ../src/krb5-auth-dialog.ui.h:33
+msgid "minutes before ticket expiry"
+msgstr "minutos antes de expirar o tíquete"
+
+#: ../src/ka-kerberos.c:177
 msgid "unknown error"
-msgstr "Erro desconhecido"
+msgstr "erro desconhecido"
 
-#: ../src/ka-dialog.c:332
+#: ../src/ka-kerberos.c:317
+msgid "Your ticket cache is currently empty"
+msgstr "O seu cache de tíquete está atualmente vazio"
+
+#: ../src/ka-kerberos.c:348
 msgid "Expired"
 msgstr "Expirado"
 
-#: ../src/ka-pwdialog.c:175
+#: ../src/ka-pwdialog.c:230
 #, c-format
 msgid "Couldn't acquire kerberos ticket: '%s'"
-msgstr "Não é possível adquirir ticket do kerberos: \"%s\""
+msgstr "Não é possível adquirir tíquete do kerberos: \"%s\""
 
-#: ../src/ka-pwdialog.c:212 ../src/ka-applet.c:375
+#: ../src/ka-pwdialog.c:269 ../src/ka-applet.c:490
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
 msgstr[0] "Suas credenciais expiram em %d minuto"
 msgstr[1] "Suas credenciais expiram em %d minutos"
 
-#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:380
+#: ../src/ka-pwdialog.c:274 ../src/ka-applet.c:495
 msgid "Your credentials have expired"
 msgstr "Suas credenciais expiraram"
 
-#: ../src/ka-pwdialog.c:237
+#: ../src/ka-pwdialog.c:297
 msgid "Please enter your Kerberos password:"
 msgstr "Por favor, digite a sua senha do Kerberos:"
 
-#: ../src/ka-pwdialog.c:248
+#: ../src/ka-pwdialog.c:310
 #, c-format
 msgid "Please enter the password for '%s':"
 msgstr "Por favor, digite a senha para \"%s\":"
 
-#: ../src/ka-pwdialog.c:263
+#: ../src/ka-pwdialog.c:328
 msgid "The password you entered is invalid"
 msgstr "A senha digitada não é válida"
 
-#: ../src/ka-pwdialog.c:279
+#: ../src/ka-pwdialog.c:344
 #, c-format
 msgid "%s Error"
 msgstr "Erro %s"
@@ -185,7 +318,7 @@ msgstr "Servidor não encontrado no banco de dados do Kerberos"
 #. krb5_err.et:krb5:KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN
 #: ../src/dummy-strings.c:31
 msgid "Principal has multiple entries in Kerberos database"
-msgstr "O Principal possui múltiplas entradas no banco de dados do Kerberos"
+msgstr "O principal possui múltiplas entradas no banco de dados do Kerberos"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE
 #: ../src/dummy-strings.c:32
@@ -195,7 +328,7 @@ msgstr "O cliente ou servidor possui uma chave nula"
 #. krb5_err.et:krb5:KRB5KDC_ERR_NULL_KEY
 #: ../src/dummy-strings.c:33
 msgid "Ticket is ineligible for postdating"
-msgstr "O ticket é inelegível para postdating"
+msgstr "O tíquete é inelegível para pós-datar"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_CANNOT_POSTDATE
 #: ../src/dummy-strings.c:34
@@ -275,7 +408,7 @@ msgstr "Pré-autenticação adicional requerida"
 #. krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_REQUIRED
 #: ../src/dummy-strings.c:49
 msgid "Requested server and ticket don't match"
-msgstr "O servidor requisitado e o ticket não correspondem"
+msgstr "O servidor requisitado e o tíquete não correspondem"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_SERVER_NOMATCH
 #: ../src/dummy-strings.c:50
@@ -291,12 +424,12 @@ msgstr "Verificação de integridade de descriptografia falhou"
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BAD_INTEGRITY
 #: ../src/dummy-strings.c:52
 msgid "Ticket expired"
-msgstr "O ticket expirou"
+msgstr "O tíquete expirou"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_EXPIRED
 #: ../src/dummy-strings.c:53
 msgid "Ticket not yet valid"
-msgstr "O ticket ainda não é válido"
+msgstr "O tíquete ainda não é válido"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_NYV
 #: ../src/dummy-strings.c:54
@@ -306,12 +439,12 @@ msgstr "A requisição é uma reprodução"
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_REPEAT
 #: ../src/dummy-strings.c:55
 msgid "The ticket isn't for us"
-msgstr "O ticket não é nosso"
+msgstr "O tíquete não é para nós"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOT_US
 #: ../src/dummy-strings.c:56
 msgid "Ticket/authenticator don't match"
-msgstr "O ticket/autenticador não correspondem"
+msgstr "O tíquete/autenticador não correspondem"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADMATCH
 #: ../src/dummy-strings.c:57
@@ -326,7 +459,7 @@ msgstr "Endereço de internet incorreto"
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADADDR
 #: ../src/dummy-strings.c:59
 msgid "Protocol version mismatch"
-msgstr "Versão do protocolo não está correta."
+msgstr "Versão do protocolo não está correta"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADVERSION
 #: ../src/dummy-strings.c:60
@@ -346,7 +479,7 @@ msgstr "Mensagem fora de ordem"
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADORDER
 #: ../src/dummy-strings.c:63
 msgid "Illegal cross-realm ticket"
-msgstr "Ticket de domínios combinados ilegal"
+msgstr "Tíquete de domínios combinados ilegal"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_ILL_CR_TKT
 #: ../src/dummy-strings.c:64
@@ -567,7 +700,7 @@ msgstr "Fim do cache de credenciais alcançado"
 #. krb5_err.et:krb5:KRB5_CC_END
 #: ../src/dummy-strings.c:107
 msgid "Request did not supply a ticket"
-msgstr "Requisição não forneceu um ticket"
+msgstr "A requisição não forneceu um tíquete"
 
 #. krb5_err.et:krb5:KRB5_NO_TKT_SUPPLIED
 #: ../src/dummy-strings.c:108
@@ -577,12 +710,12 @@ msgstr "Principal errado na requisição"
 #. krb5_err.et:krb5:KRB5KRB_AP_WRONG_PRINC
 #: ../src/dummy-strings.c:109
 msgid "Ticket has invalid flag set"
-msgstr "Ticket possui definição de sinalizações inválida"
+msgstr "O tíquete possui definições de sinalização inválidos"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_INVALID
 #: ../src/dummy-strings.c:110
 msgid "Requested principal and ticket don't match"
-msgstr "Principal requisitado e ticket não correspondem"
+msgstr "O principal requisitado e tíquete não correspondem"
 
 #. krb5_err.et:krb5:KRB5_PRINC_NOMATCH
 #: ../src/dummy-strings.c:111
@@ -598,7 +731,7 @@ msgstr "Distorção do relógio na resposta KDC"
 #: ../src/dummy-strings.c:113
 msgid "Client/server realm mismatch in initial ticket request"
 msgstr ""
-"Domínio do cliente/servidor incompatível na requisição inicial do ticket "
+"Domínio do cliente/servidor incompatível na requisição inicial do tíquete"
 
 #. krb5_err.et:krb5:KRB5_IN_TKT_REALM_MISMATCH
 #: ../src/dummy-strings.c:114
@@ -774,7 +907,7 @@ msgstr "Erro gravando na tabela de chave"
 #. krb5_err.et:krb5:KRB5_KT_IOERR
 #: ../src/dummy-strings.c:149
 msgid "Cannot find ticket for requested realm"
-msgstr "Não é possível encontrar ticket para requisições de domínio"
+msgstr "Não foi possível encontrar tíquete para o domínio solicitado"
 
 #. krb5_err.et:krb5:KRB5_NO_TKT_IN_RLM
 #: ../src/dummy-strings.c:150
@@ -859,7 +992,7 @@ msgstr "Opção de combinado KDC inválida (erro da biblioteca interna)"
 #. krb5_err.et:krb5:KRB5_INVALID_FLAGS
 #: ../src/dummy-strings.c:166
 msgid "Request missing second ticket"
-msgstr "A requisição precisa de um segundo ticket"
+msgstr "A requisição precisa de um segundo tíquete"
 
 #. krb5_err.et:krb5:KRB5_NO_2ND_TKT
 #: ../src/dummy-strings.c:167
@@ -944,7 +1077,7 @@ msgstr "Conversão para serviço principal indefinido para tipo de nome"
 #. krb5_err.et:krb5:KRB5_SNAME_UNSUPP_NAMETYPE
 #: ../src/dummy-strings.c:183
 msgid "Initial Ticket response appears to be Version 4 error"
-msgstr "Resposta do ticket inicial parece ser erro da versão 4"
+msgstr "Resposta do tíquete inicial parece ser erro da versão 4"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_V4_REPLY
 #: ../src/dummy-strings.c:184
@@ -955,7 +1088,7 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_REALM_CANT_RESOLVE
 #: ../src/dummy-strings.c:185
 msgid "Requesting ticket can't get forwardable tickets"
-msgstr "Ao requisitar ticket não é possível obter tickets encaminhados"
+msgstr "Ao requisitar tíquete não é possível obter tickets encaminhados"
 
 #. krb5_err.et:krb5:KRB5_TKT_NOT_FORWARDABLE
 #: ../src/dummy-strings.c:186
@@ -1000,7 +1133,8 @@ msgstr "Rótulo da chave muito grande"
 #. krb5_err.et:krb5:KRB5_KT_NAME_TOOLONG
 #: ../src/dummy-strings.c:194
 msgid "Key version number for principal in key table is incorrect"
-msgstr "Número da chave de conversão para principal na tabela de está incorreta"
+msgstr ""
+"Número da chave de conversão para principal na tabela de está incorreta"
 
 #. krb5_err.et:krb5:KRB5_KT_KVNONOTFOUND
 #: ../src/dummy-strings.c:195
@@ -1035,7 +1169,8 @@ msgstr "Tipo de criptografia não permitido"
 #. krb5_err.et:krb5:KRB5_NOPERM_ETYPE
 #: ../src/dummy-strings.c:201
 msgid "No supported encryption types (config file error?)"
-msgstr "Sem tipos de criptografia suportados (erro no arquivo de configuração?)"
+msgstr ""
+"Sem tipos de criptografia suportados (erro no arquivo de configuração?)"
 
 #. krb5_err.et:krb5:KRB5_CONFIG_ETYPE_NOSUPP
 #: ../src/dummy-strings.c:202
@@ -1385,57 +1520,59 @@ msgstr "Número mágico ruim para GSSAPI OID"
 msgid "Bad magic number for GSSAPI QUEUE"
 msgstr "Número mágico ruim para GSSAPI QUEUE"
 
-#: ../src/ka-applet.c:369
+#: ../src/ka-applet.c:484
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "Suas credenciais expiram em %.2d:%.2dh"
 
-#: ../src/ka-applet.c:504
+#: ../src/ka-applet.c:677
+msgid "List Tickets"
+msgstr "Listar tíquetes"
+
+#: ../src/ka-applet.c:687
+msgid "Get Ticket"
+msgstr "Obter tíquete"
+
+#: ../src/ka-applet.c:696
 msgid "Don't show me this again"
 msgstr "Não exibir novamente"
 
-#: ../src/ka-applet.c:511
-msgid "Get Ticket"
-msgstr "Obter ticket"
+#: ../src/ka-applet.c:703
+msgid "Remove Credentials Cache"
+msgstr "Remover cache de credenciais"
 
-#: ../src/ka-applet.c:555
-msgid "Network credentials valid"
-msgstr "Credenciais de rede válidas"
+#: ../src/ka-applet.c:763
+msgid "You have valid Kerberos credentials."
+msgstr "Você possui credenciais válidas do Kerberos."
 
-#: ../src/ka-applet.c:556
+#: ../src/ka-applet.c:765
 msgid "You've refreshed your Kerberos credentials."
-msgstr "Você atualizou suas credenciais do Kerberos"
+msgstr "Você atualizou suas credenciais do Kerberos."
+
+#: ../src/ka-applet.c:768
+msgid "Network credentials valid"
+msgstr "Credenciais de rede válidas"
 
-#: ../src/ka-applet.c:572
+#: ../src/ka-applet.c:787
 msgid "Network credentials expiring"
 msgstr "Credenciais de rede expirando"
 
-#: ../src/ka-applet.c:590
+#: ../src/ka-applet.c:804
 msgid "Network credentials expired"
 msgstr "Credenciais de rede expiradas"
 
-#: ../src/ka-applet.c:591
-msgid "Your Kerberos credentails have expired."
-msgstr "Suas credenciais no Kerberos expiraram."
-
-#: ../src/ka-applet.c:635
-#, c-format
-msgid "There was an error launching the preferences dialog: %s"
-msgstr "Ocorreu um erro lançando o diálogo de preferências: %s"
+#: ../src/ka-applet.c:805
+msgid "Your Kerberos credentials have expired."
+msgstr "Suas credenciais do Kerberos expiraram."
 
-#. Translators: add the translators of your language here
-#: ../src/ka-applet.c:682
-msgid "translator-credits"
-msgstr "Djavan Fagundes <djavan@comum.org>"
-
-#: ../src/ka-applet.c:727
+#: ../src/ka-applet.c:884
 msgid "Remove Credentials _Cache"
 msgstr "Remover _cache de credenciais"
 
 #. Ticket dialog
-#: ../src/ka-applet.c:737
+#: ../src/ka-applet.c:894
 msgid "_List Tickets"
-msgstr "_Listar tickets"
+msgstr "_Listar tíquetes"
 
 #: ../src/ka-tools.c:45
 #, c-format
@@ -1446,267 +1583,185 @@ msgstr ""
 "Ocorreu um erro exibindo a ajuda:\n"
 "%s"
 
-#: ../src/ka-tickets.c:54
+#. Translators: add the translators of your language here
+#: ../src/ka-tools.c:83
+msgid "translator-credits"
+msgstr "Djavan Fagundes <djavan@comum.org>"
+
+#: ../src/ka-main-window.c:122
 msgid "Principal"
 msgstr "Principal"
 
-#: ../src/ka-tickets.c:60
+#: ../src/ka-main-window.c:128
 msgid "Start Time"
 msgstr "Hora de início"
 
-#: ../src/ka-tickets.c:66
+#: ../src/ka-main-window.c:134
 msgid "End Time"
 msgstr "Hora de término"
 
-#: ../src/ka-tickets.c:72
+#. Translators: this is an abbreviation for forwardable
+#: ../src/ka-main-window.c:141
 msgid "Fwd"
 msgstr "Enc"
 
-#: ../src/ka-tickets.c:78
+#. Translators: this is an abbreviation for proxiable
+#: ../src/ka-main-window.c:148
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/ka-tickets.c:84
+#. Translators: this is an abbreviation for renewable
+#: ../src/ka-main-window.c:155
 msgid "Renew"
 msgstr "Renovar"
 
-#: ../src/ka-tickets.c:107
+#: ../src/ka-main-window.c:185
 msgid "Error displaying service ticket information"
-msgstr "Erro exibindo informação de serviço de ticket"
+msgstr "Ocorreu erro ao exibir informações do serviço de tíquete"
 
-#: ../src/krb5-auth-dialog.desktop.in.h:1
-msgid "Kerberos Network Authentication Dialog"
-msgstr "Diálogo de autenticação de rede do Kerberos"
+#: ../src/ka-preferences.c:297
+msgid "Choose Certificate"
+msgstr "Escolher certificado"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:1
-msgid "Enabled plugins"
-msgstr "Habilitar plug-ins"
+#: ../src/ka-preferences.c:313
+msgid "X509 Certificates"
+msgstr "Certificados X509"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:2
-msgid "Forwardable ticket"
-msgstr "Ticket encaminhável"
+#: ../src/ka-preferences.c:317
+msgid "all files"
+msgstr "Todos arquivos"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:3
+#: ../src/krb5-auth-dialog.desktop.in.h:2
+msgid "Kerberos Network Authentication Dialog"
+msgstr "Diálogo de autenticação de rede do Kerberos"
+
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:1
 msgid "Kerberos principal"
 msgstr "Principal do Kerberos"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:4
-msgid "List of plugins that should be loaded and activated on startup."
-msgstr "Lista de plug-ins que podem ser carregados e ativados no início."
-
-#: ../src/krb5-auth-dialog.schemas.in.h:5
-msgid "Notify user when ticket becomes valid"
-msgstr "Notificar usuário quando tickets se tornarem válidos"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:2
+#| msgid "The kerberos principal to acquire the ticket for"
+msgid "The Kerberos principal to acquire the ticket for"
+msgstr "O principal do Kerberos adquiriu tíquete"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:6
-msgid "Notify user when ticket has expired"
-msgstr "Notificar usuário quando tickets expirarem"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:7
-msgid "Notify user when ticket is about to expire"
-msgstr "Notificar usuário quando tickets estiverem para expirar"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:8
-msgid "PKINIT CA certificates"
-msgstr "Certificados PKINIT CA"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:9
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:3
 msgid "PKINIT identifier"
 msgstr "Identificador PKINIT"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:10
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:4
+msgid "The principal's public/private/certificate identifier when using PKINIT"
+msgstr ""
+"O identificador do certificado público/privado do principal ao usar o PKINIT"
+
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:5
 msgid "PKINIT trust anchors"
 msgstr "Âncoras confiáveis PKINIT"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:11
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:6
+msgid "PKINIT CA certificates"
+msgstr "Certificados PKINIT CA"
+
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:7
 msgid "Prompt minutes before expiry"
 msgstr "Avisar minutos antes de expirar"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:12
-msgid "Proxiable ticket"
-msgstr "Ticket apto a trabalhar com proxy"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:13
-msgid "Renewable ticket"
-msgstr "Ticket renovável"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:14
-msgid "Requested tickets should be forwardable"
-msgstr "Os tickets requisitados devem ser encaminháveis"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:15
-msgid "Requested tickets should be proxiable"
-msgstr "Os tickets requisitados devem ser aptos a trabalhar com proxy"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:16
-msgid "Requested tickets should be renewable"
-msgstr "Os tickets requisitados devem ser renováveis"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:17
-msgid "Show a trayicon in the status area of the panel"
-msgstr "Exibir um ícone na área de notificação do painel"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:18
-msgid "Show trayicon"
-msgstr "Exibir ícone na área de notificação"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:19
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:8
 msgid ""
 "Start prompting/displaying notifications that many minutes before expiry"
 msgstr "Iniciar notificações de pergunta/exibição minutos antes de expirar"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:20
-msgid "The kerberos principal to acquire the ticket for"
-msgstr "O principal do kerberos adquiriu tickets"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:21
-msgid "The principal's public/private/certificate identifier when using PKINIT"
-msgstr ""
-"O identificador do certificado público/privado do principal ao usar o PKINIT"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:22
-msgid "ticket expired notification"
-msgstr "notificação de ticket expirado"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:23
-msgid "ticket expiring notification"
-msgstr "notificação de ticket expirando"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:24
-msgid "valid ticket notification"
-msgstr "notificação de ticket válido"
-
-#: ../secmem/util.c:106
-#, c-format
-msgid "Warning: running q-agent setuid on this system is dangerous\n"
-msgstr "Aviso: executando q-agent setuid neste sistema é perigoso\n"
-
-#: ../preferences/ka-preferences.c:345
-msgid "Choose Certificate"
-msgstr "Escolher certificado"
-
-#: ../preferences/ka-preferences.c:361
-msgid "X509 Certificates"
-msgstr "Certificados X509"
-
-#: ../preferences/ka-preferences.c:365
-msgid "all files"
-msgstr "Todos arquivos"
-
-#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:2
-msgid "Set your Kerberos network authentication preferences"
-msgstr "Define as suas preferências de autenticação de rede do Kerberos"
-
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:1
-msgid "Appearance"
-msgstr "Aparência"
-
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:2
-msgid "Applet"
-msgstr "Mini-aplicativo"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:9
+msgid "Forwardable ticket"
+msgstr "Tíquete encaminhável"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:3
-msgid "Certificate and private key used for authentication"
-msgstr "Certificado e chave privada usada para autenticação"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:10
+msgid "Requested tickets should be forwardable"
+msgstr "Os tíquetes requisitados devem ser encaminháveis"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:4
-msgid "If checked, display the tray icon in the status bar"
-msgstr "Se definido, exibe o ícone de notificação na barra de status"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:11
+msgid "Renewable ticket"
+msgstr "Tíquete renovável"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:5
-msgid "If checked, request forwardable tickets"
-msgstr "Se definido, requisita tickets encaminháveis"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:12
+msgid "Requested tickets should be renewable"
+msgstr "Os tíquetes requisitados devem ser renováveis"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:6
-msgid "If checked, request proxiable tickets"
-msgstr "Se marcado, requisita tickets aptos a trabalhar com proxy"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:13
+msgid "Proxiable ticket"
+msgstr "Tíquete apto a trabalhar com proxy"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:7
-msgid "If checked, request renewable tickets"
-msgstr "Se marcado, requisita tickets renováveis"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:14
+msgid "Requested tickets should be proxiable"
+msgstr "Os tíquetes requisitados devem ser aptos a trabalhar com proxy"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:8
-msgid "If checked, use a security token (Smartcard) to authenticate."
-msgstr "Se marcado, usa o token de segurança (Smartcard) para autenticar."
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:15
+msgid "Configuration tickets"
+msgstr "Tíquetes de configuração"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:9
-msgid "Kerberos"
-msgstr "Kerberos"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:16
+msgid "Show configuration tickets"
+msgstr "Mostra os tíquetes de configuração"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:10
-msgid "Kerberos Authentication Configuration"
-msgstr "Configuração de autenticação do Kerberos"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:17
+msgid "valid ticket notification"
+msgstr "notificação de tíquete válido"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:11
-msgid "Kerberos User"
-msgstr "Usuário do Kerberos"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:18
+msgid "Notify user when ticket becomes valid"
+msgstr "Notificar usuário quando tíquetes se tornarem válidos"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:12
-msgid "Kerberos principal:"
-msgstr "Principal do Kerberos:"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:19
+msgid "ticket expiring notification"
+msgstr "notificação de tíquete expirando"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:13
-msgid "Notifications"
-msgstr "Notificações"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:20
+msgid "Notify user when ticket is about to expire"
+msgstr "Notificar usuário quando tíquetes estiverem para expirar"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:14
-msgid "PKINIT:"
-msgstr "PKINIT:"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:21
+msgid "ticket expired notification"
+msgstr "notificação de tíquete expirado"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:15
-msgid "Requested Kerberos tickets should be:"
-msgstr "Os tickets requisitados do Kerberos podem ser:"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:22
+msgid "Notify user when ticket has expired"
+msgstr "Notificar usuário quando tíquetes expirarem"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:16
-msgid ""
-"Send notification about ticket expiry that many minutes before it finally "
-"expires"
-msgstr ""
-"Envia notificações sobre expiração de tickets minutos antes de finalmente "
-"expirar"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:23
+msgid "Enabled plugins"
+msgstr "Habilitar plug-ins"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:17
-msgid "Show tray icon"
-msgstr "Exibir ícone na área de notificação"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:24
+msgid "List of plugins that should be loaded and activated on startup."
+msgstr "Lista de plug-ins que podem ser carregados e ativados no início."
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:18
-msgid "Ticket Options"
-msgstr "Opções de ticket"
+#: ../secmem/util.c:106
+#, c-format
+msgid "Warning: running q-agent setuid on this system is dangerous\n"
+msgstr "Aviso: executando q-agent setuid neste sistema é perigoso\n"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:19
-msgid "Use Smartcard"
-msgstr "Usar Smartcard"
+#~ msgid "Network Authentication"
+#~ msgstr "Autenticação da rede"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:20
-msgid "Userid:"
-msgstr "Id do usuário:"
+#~ msgid "There was an error launching the preferences dialog: %s"
+#~ msgstr "Ocorreu um erro lançando o diálogo de preferências: %s"
 
-#. Used in combination: 'Warn x minutes before expiry'
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:22
-msgid "Warn"
-msgstr "Aviso"
+#~ msgid "Show a trayicon in the status area of the panel"
+#~ msgstr "Exibir um ícone na área de notificação do painel"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:23
-msgid "X509 trust anchors:"
-msgstr "Âncoras confiáveis X509:"
+#~ msgid "Show trayicon"
+#~ msgstr "Exibir ícone na área de notificação"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:24
-msgid "_Browse..."
-msgstr "_Navegar..."
+#~ msgid "Set your Kerberos network authentication preferences"
+#~ msgstr "Define as suas preferências de autenticação de rede do Kerberos"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:25
-msgid "forwardable"
-msgstr "encaminhável"
+#~ msgid "Appearance"
+#~ msgstr "Aparência"
 
-#. Used in combination: 'Warn x minutes before expiry'
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:27
-msgid "minutes before expiry"
-msgstr "minutos antes de expirar"
+#~ msgid "Applet"
+#~ msgstr "Mini-aplicativo"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:28
-msgid "proxiable"
-msgstr "apto a trabalhar com proxy"
+#~ msgid "If checked, display the tray icon in the status bar"
+#~ msgstr "Se definido, exibe o ícone de notificação na barra de status"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:29
-msgid "renewable"
-msgstr "renovável"
+#~ msgid "Show tray icon"
+#~ msgstr "Exibir ícone na área de notificação"
diff --git a/po/sl.po b/po/sl.po
index dca6816..944f9c0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,8 +8,8 @@ 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&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-06 17:21+0000\n"
-"PO-Revision-Date: 2011-09-07 21:28+0100\n"
+"POT-Creation-Date: 2013-03-16 16:10+0000\n"
+"PO-Revision-Date: 2013-03-16 17:33+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: \n"
@@ -21,155 +21,155 @@ msgstr ""
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#.
+#. * vim:ts:sts=4:sw=4:et:
+#.
 #: ../src/krb5-auth-dialog.ui.h:1
-msgid "Certificate and private key used for authentication"
-msgstr "Potrdilo in osebni ključ uporabljena za overitev"
+#: ../src/krb5-auth-dialog.desktop.in.h:1
+msgid "Kerberos Authentication"
+msgstr "Overitev Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:2
-msgid "Certificate used to verify digital signatures."
-msgstr "Potrdilo, ki se uporablja za potrjevanje digitalnih podpisov."
+msgid "_Renew Ticket"
+msgstr "_Obnovi vstopnico"
 
 #: ../src/krb5-auth-dialog.ui.h:3
-msgid "Configure the use of certificates and smartcards for your Kerberos network authentication."
-msgstr "Nastavite uporabo potrdil in pametnih kartic za vašo overitev omrežja Kerberos."
+msgid "Service Tickets"
+msgstr "Storitvene vstopnice"
 
 #: ../src/krb5-auth-dialog.ui.h:4
-msgid "If checked, request forwardable tickets"
-msgstr "Izbrana možnost določi zahtevo za uporabo prenosljivih vstopnic"
+msgid "_File"
+msgstr "_Datoteka"
 
 #: ../src/krb5-auth-dialog.ui.h:5
-msgid "If checked, request proxiable tickets"
-msgstr "Izbrana možnost omogoči zahtevo za posredovalno vstopnico"
+msgid "_Edit"
+msgstr "_Uredi"
 
 #: ../src/krb5-auth-dialog.ui.h:6
-msgid "If checked, request renewable tickets"
-msgstr "Izbrana možnost določi zahtevo za uporabo obnovljivih vstopnic"
+msgid "_Help"
+msgstr "Pomo_č"
 
 #: ../src/krb5-auth-dialog.ui.h:7
-msgid "If checked, use a security token (Smartcard) to authenticate."
-msgstr "Izbrana možnost omogoči zahtevo za uporabo Varnostne SmartCard za overjanje"
+msgid "Kerberos User"
+msgstr "Uporabnik Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:8
-msgid "Kerberos"
-msgstr "Kerberos"
+msgid "The name of your Kerberos account. Leave blank to use your current username."
+msgstr "Ime vašega računa Kerberos. Pustite prazno za uporabo vašega trenutnega uporabniškega imena."
 
-#.
-#. * vim:ts:sts=4:sw=4:et:
-#.
 #: ../src/krb5-auth-dialog.ui.h:9
-#: ../src/krb5-auth-dialog.desktop.in.h:1
-msgid "Kerberos Authentication"
-msgstr "Overitev Kerberos"
+msgid "Kerberos principal:"
+msgstr "Kerberos ravnatelj:"
 
 #: ../src/krb5-auth-dialog.ui.h:10
 msgid "Kerberos Ticket Options"
 msgstr "Možnosti vstopnice Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:11
-msgid "Kerberos User"
-msgstr "Uporabnik Kerberos"
+msgid "Requested Kerberos tickets should be:"
+msgstr "Zahtevane vstopnice Kerberos bi morale biti:"
 
 #: ../src/krb5-auth-dialog.ui.h:12
-msgid "Kerberos principal:"
-msgstr "Kerberos ravnatelj:"
+msgid "forwardable"
+msgstr "prenosljiva"
 
 #: ../src/krb5-auth-dialog.ui.h:13
-msgid "Notifications"
-msgstr "Obvestila"
+msgid "If checked, request forwardable tickets"
+msgstr "Izbrana možnost določi zahtevo za uporabo prenosljivih vstopnic"
 
 #: ../src/krb5-auth-dialog.ui.h:14
-msgid "PKINIT"
-msgstr "PKINIT"
+msgid "renewable"
+msgstr "obnovljiva"
 
 #: ../src/krb5-auth-dialog.ui.h:15
-msgid "Requested Kerberos tickets should be:"
-msgstr "Zahtevane vstopnice Kerberos bi morale biti:"
+msgid "If checked, request renewable tickets"
+msgstr "Izbrana možnost določi zahtevo za uporabo obnovljivih vstopnic"
 
 #: ../src/krb5-auth-dialog.ui.h:16
-msgid "Send notification about ticket expiry that many minutes before it finally expires"
-msgstr "Pošiljanje obvestila o preteku vstopnice toliko minut pred končnim pretekom."
+msgid "proxiable"
+msgstr "posredovana"
 
 #: ../src/krb5-auth-dialog.ui.h:17
-msgid "Service Tickets"
-msgstr "Storitvene vstopnice"
+msgid "If checked, request proxiable tickets"
+msgstr "Izbrana možnost omogoči zahtevo za posredovalno vstopnico"
 
 #: ../src/krb5-auth-dialog.ui.h:18
-msgid "The name of your Kerberos account. Leave blank to use your current username."
-msgstr "Ime vašega računa Kerberos. Pustite prazno za uporabo vašega trenutnega uporabniškega imena."
+msgid "Kerberos"
+msgstr "Kerberos"
 
 #: ../src/krb5-auth-dialog.ui.h:19
+msgid "Userid"
+msgstr "Uporabniški id"
+
+#: ../src/krb5-auth-dialog.ui.h:20
 msgid "Use Smartcard"
 msgstr "Uporabi SmartCard"
 
-#: ../src/krb5-auth-dialog.ui.h:20
-msgid "Userid"
-msgstr "Uporabniški id"
+#: ../src/krb5-auth-dialog.ui.h:21
+msgid "If checked, use a security token (Smartcard) to authenticate."
+msgstr "Izbrana možnost omogoči zahtevo za uporabo Varnostne SmartCard za overjanje"
 
-#. Used in combination: 'Warn x minutes before expiry'
 #: ../src/krb5-auth-dialog.ui.h:22
-msgid "Warn"
-msgstr "Opozori"
+msgid "Certificate and private key used for authentication"
+msgstr "Potrdilo in osebni ključ uporabljena za overitev"
 
 #: ../src/krb5-auth-dialog.ui.h:23
-msgid "X509 trust anchors"
-msgstr "X509 zaupna sidra"
-
-#: ../src/krb5-auth-dialog.ui.h:24
 msgid "_Browse..."
 msgstr "_Prebrskaj ..."
 
+#: ../src/krb5-auth-dialog.ui.h:24
+msgid "X509 trust anchors"
+msgstr "X509 zaupna sidra"
+
 #: ../src/krb5-auth-dialog.ui.h:25
-msgid "_Edit"
-msgstr "_Uredi"
+msgid "Certificate used to verify digital signatures."
+msgstr "Potrdilo, ki se uporablja za potrjevanje digitalnih podpisov."
 
 #: ../src/krb5-auth-dialog.ui.h:26
-msgid "_File"
-msgstr "_Datoteka"
+msgid "Configure the use of certificates and smartcards for your Kerberos network authentication."
+msgstr "Nastavite uporabo potrdil in pametnih kartic za vašo overitev omrežja Kerberos."
 
 #: ../src/krb5-auth-dialog.ui.h:27
-msgid "_Help"
-msgstr "Pomo_č"
+msgid "PKINIT"
+msgstr "PKINIT"
 
 #: ../src/krb5-auth-dialog.ui.h:28
-msgid "_Renew Ticket"
-msgstr "_Obnovi vstopnico"
-
-#: ../src/krb5-auth-dialog.ui.h:29
-msgid "forwardable"
-msgstr "prenosljiva"
+msgid "Notifications"
+msgstr "Obvestila"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../src/krb5-auth-dialog.ui.h:31
-msgid "minutes before ticket expiry"
-msgstr "Opozorilo pred potekom v minutah"
+#: ../src/krb5-auth-dialog.ui.h:30
+msgid "Warn"
+msgstr "Opozori"
 
-#: ../src/krb5-auth-dialog.ui.h:32
-msgid "proxiable"
-msgstr "posredovana"
+#: ../src/krb5-auth-dialog.ui.h:31
+msgid "Send notification about ticket expiry that many minutes before it finally expires"
+msgstr "Pošiljanje obvestila o preteku vstopnice toliko minut pred končnim pretekom."
 
+#. Used in combination: 'Warn x minutes before expiry'
 #: ../src/krb5-auth-dialog.ui.h:33
-msgid "renewable"
-msgstr "obnovljiva"
+msgid "minutes before ticket expiry"
+msgstr "Opozorilo pred potekom v minutah"
 
-#: ../src/ka-dialog.c:177
+#: ../src/ka-kerberos.c:177
 msgid "unknown error"
 msgstr "neznana napaka"
 
-#: ../src/ka-dialog.c:317
+#: ../src/ka-kerberos.c:317
 msgid "Your ticket cache is currently empty"
 msgstr "Vaš predpomnilnik vozovnic je trenutno prazen"
 
-#: ../src/ka-dialog.c:343
+#: ../src/ka-kerberos.c:348
 msgid "Expired"
 msgstr "Pretečeno"
 
-#: ../src/ka-pwdialog.c:178
+#: ../src/ka-pwdialog.c:230
 #, c-format
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr "Ni mogoče pridobiti vstopnice kerberos: '%s'"
 
-#: ../src/ka-pwdialog.c:217
-#: ../src/ka-applet.c:368
+#: ../src/ka-pwdialog.c:269
+#: ../src/ka-applet.c:490
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
@@ -178,25 +178,25 @@ msgstr[1] "Vaša poverila potečejo v %d minuti"
 msgstr[2] "Vaša poverila potečejo v %d minutah"
 msgstr[3] "Vaša poverila potečejo v %d minutah"
 
-#: ../src/ka-pwdialog.c:222
-#: ../src/ka-applet.c:373
+#: ../src/ka-pwdialog.c:274
+#: ../src/ka-applet.c:495
 msgid "Your credentials have expired"
 msgstr "Vaša poverila so potekla"
 
-#: ../src/ka-pwdialog.c:245
+#: ../src/ka-pwdialog.c:297
 msgid "Please enter your Kerberos password:"
 msgstr "Vnesite svoje geslo Kerberos:"
 
-#: ../src/ka-pwdialog.c:258
+#: ../src/ka-pwdialog.c:310
 #, c-format
 msgid "Please enter the password for '%s':"
 msgstr "Vnesite geslo za '%s':"
 
-#: ../src/ka-pwdialog.c:276
+#: ../src/ka-pwdialog.c:328
 msgid "The password you entered is invalid"
 msgstr "Vneseno geslo je neveljavno"
 
-#: ../src/ka-pwdialog.c:292
+#: ../src/ka-pwdialog.c:344
 #, c-format
 msgid "%s Error"
 msgstr "%s napaka"
@@ -1508,57 +1508,57 @@ msgstr "Slabo čarobno število za GSSAPI OID"
 msgid "Bad magic number for GSSAPI QUEUE"
 msgstr "Slabo čarobno število od GSSAPI VRSTE"
 
-#: ../src/ka-applet.c:362
+#: ../src/ka-applet.c:484
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "Vaša poverila potečejo v %.2d%.2dh"
 
-#: ../src/ka-applet.c:544
+#: ../src/ka-applet.c:677
 msgid "List Tickets"
 msgstr "Izpiši vstopnice"
 
-#: ../src/ka-applet.c:554
+#: ../src/ka-applet.c:687
 msgid "Get Ticket"
 msgstr "Dobi vstopnico"
 
-#: ../src/ka-applet.c:563
+#: ../src/ka-applet.c:696
 msgid "Don't show me this again"
 msgstr "Tega ne prikaži več"
 
-#: ../src/ka-applet.c:570
+#: ../src/ka-applet.c:703
 msgid "Remove Credentials Cache"
-msgstr "Odstrani predpomnilnik varoval"
+msgstr "Odstrani predpomnilnik poveril"
 
-#: ../src/ka-applet.c:619
+#: ../src/ka-applet.c:763
 msgid "You have valid Kerberos credentials."
 msgstr "Naložena so veljavna poverila Kerberos"
 
-#: ../src/ka-applet.c:621
+#: ../src/ka-applet.c:765
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Osvežili ste svoja poverila Kerberos"
 
-#: ../src/ka-applet.c:624
+#: ../src/ka-applet.c:768
 msgid "Network credentials valid"
-msgstr "Omrežna varovala so veljavna"
+msgstr "Omrežna poverila so veljavna"
 
-#: ../src/ka-applet.c:643
+#: ../src/ka-applet.c:787
 msgid "Network credentials expiring"
-msgstr "Omrežna varovala bodo potekla"
+msgstr "Omrežna poverila bodo potekla"
 
-#: ../src/ka-applet.c:661
+#: ../src/ka-applet.c:804
 msgid "Network credentials expired"
-msgstr "Omrežna varovala so potekla"
+msgstr "Omrežna poverila so potekla"
 
-#: ../src/ka-applet.c:662
-msgid "Your Kerberos credentails have expired."
-msgstr "Vaša varovala Kerberos so potekla."
+#: ../src/ka-applet.c:805
+msgid "Your Kerberos credentials have expired."
+msgstr "Poverila Kerberos so potekla."
 
-#: ../src/ka-applet.c:741
+#: ../src/ka-applet.c:884
 msgid "Remove Credentials _Cache"
-msgstr "Odstrani _predpomnilnik varoval"
+msgstr "Odstrani _predpomnilnik poveril"
 
 #. Ticket dialog
-#: ../src/ka-applet.c:751
+#: ../src/ka-applet.c:894
 msgid "_List Tickets"
 msgstr "_Naštej vstopnice"
 
@@ -1578,43 +1578,46 @@ msgstr ""
 "Andrej Žnidaršič\n"
 "Matej Urbančič"
 
-#: ../src/ka-main-window.c:119
+#: ../src/ka-main-window.c:122
 msgid "Principal"
 msgstr "Ravnatelj"
 
-#: ../src/ka-main-window.c:125
+#: ../src/ka-main-window.c:128
 msgid "Start Time"
 msgstr "Začetni čas"
 
-#: ../src/ka-main-window.c:131
+#: ../src/ka-main-window.c:134
 msgid "End Time"
 msgstr "Končni čas"
 
-#: ../src/ka-main-window.c:137
+#. Translators: this is an abbreviation for forwardable
+#: ../src/ka-main-window.c:141
 msgid "Fwd"
 msgstr "Posreduj"
 
-#: ../src/ka-main-window.c:143
+#. Translators: this is an abbreviation for proxiable
+#: ../src/ka-main-window.c:148
 msgid "Proxy"
 msgstr "Posredovalni strežnik"
 
-#: ../src/ka-main-window.c:149
+#. Translators: this is an abbreviation for renewable
+#: ../src/ka-main-window.c:155
 msgid "Renew"
 msgstr "Obnovi"
 
-#: ../src/ka-main-window.c:176
+#: ../src/ka-main-window.c:185
 msgid "Error displaying service ticket information"
 msgstr "Napaka med prikazovanjem podrobnosti storitvene vstopnice"
 
-#: ../src/ka-preferences.c:340
+#: ../src/ka-preferences.c:297
 msgid "Choose Certificate"
 msgstr "Izbor potrdila"
 
-#: ../src/ka-preferences.c:356
+#: ../src/ka-preferences.c:313
 msgid "X509 Certificates"
 msgstr "X509 potrdila"
 
-#: ../src/ka-preferences.c:360
+#: ../src/ka-preferences.c:317
 msgid "all files"
 msgstr "vse datoteke"
 
@@ -1622,133 +1625,104 @@ msgstr "vse datoteke"
 msgid "Kerberos Network Authentication Dialog"
 msgstr "Pogovorno okno Kerberos omrežne overitve"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:1
-msgid "Enabled plugins"
-msgstr "Omogočeni vstavki"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:2
-msgid "Forwardable ticket"
-msgstr "Prenosljiva vstopnica"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:3
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:1
 msgid "Kerberos principal"
 msgstr "Kerberos ravnatelj"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:4
-msgid "List of plugins that should be loaded and activated on startup."
-msgstr "Seznam vstavkov, ki bodo naloženi in omogočeni ob zagonu."
-
-#: ../src/krb5-auth-dialog.schemas.in.h:5
-msgid "Notify user when ticket becomes valid"
-msgstr "Obvesti uporabnika, ko vstopnica postane veljavna"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:6
-msgid "Notify user when ticket has expired"
-msgstr "Obvesti uporabnika ob poteku vstopnice"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:2
+msgid "The Kerberos principal to acquire the ticket for"
+msgstr "Ravnatelj Kerberos za izdajo vstopnice za"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:7
-msgid "Notify user when ticket is about to expire"
-msgstr "Obvesti uporabnika, ko bo vstopnica potekla"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:8
-msgid "PKINIT CA certificates"
-msgstr "CA potrdila PKINIT"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:9
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:3
 msgid "PKINIT identifier"
 msgstr "Določilnik PKINIT"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:10
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:4
+msgid "The principal's public/private/certificate identifier when using PKINIT"
+msgstr "Ravnateljevo javno/zasebno/potrdilno določilo ob uporabi PKINIT"
+
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:5
 msgid "PKINIT trust anchors"
 msgstr "Sidra zaupanja PKINIT"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:11
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:6
+msgid "PKINIT CA certificates"
+msgstr "CA potrdila PKINIT"
+
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:7
 msgid "Prompt minutes before expiry"
 msgstr "Opozorilo pred potekom v minutah"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:12
-msgid "Proxiable ticket"
-msgstr "Posredovalna vstopnica"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:8
+msgid "Start prompting/displaying notifications that many minutes before expiry"
+msgstr "Začetek prikazovanja obvestil toliko minut pred potekom"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:13
-msgid "Renewable ticket"
-msgstr "Obnovljiva vstopnica"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:9
+msgid "Forwardable ticket"
+msgstr "Prenosljiva vstopnica"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:14
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:10
 msgid "Requested tickets should be forwardable"
 msgstr "Zahtevane vstopnice bi morale biti prenosljive"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:15
-msgid "Requested tickets should be proxiable"
-msgstr "Zahtevano vstopnico bi moralo biti mogoče posredovati"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:11
+msgid "Renewable ticket"
+msgstr "Obnovljiva vstopnica"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:16
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:12
 msgid "Requested tickets should be renewable"
 msgstr "Zahtevane vstopnice bi morale biti obnovljive"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:17
-msgid "Start prompting/displaying notifications that many minutes before expiry"
-msgstr "Začetek prikazovanja obvestil toliko minut pred potekom"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:18
-msgid "The kerberos principal to acquire the ticket for"
-msgstr "Kerberos ravnatelj za izdajo vstopnice"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:13
+msgid "Proxiable ticket"
+msgstr "Posredovalna vstopnica"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:19
-msgid "The principal's public/private/certificate identifier when using PKINIT"
-msgstr "Ravnateljevo javno/zasebno/potrdilno določilo ob uporabi PKINIT"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:14
+msgid "Requested tickets should be proxiable"
+msgstr "Zahtevano vstopnico bi moralo biti mogoče posredovati"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:20
-msgid "ticket expired notification"
-msgstr "obvestilo potekle vstopnice"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:15
+msgid "Configuration tickets"
+msgstr "Nastavitvene vstopnice"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:21
-msgid "ticket expiring notification"
-msgstr "obvestilo o pretekanju vstopnice"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:16
+msgid "Show configuration tickets"
+msgstr "Pokaži nastavitvene vstopnice"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:22
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:17
 msgid "valid ticket notification"
 msgstr "obvestilo veljavne vstopnice"
 
-#: ../secmem/util.c:106
-#, c-format
-msgid "Warning: running q-agent setuid on this system is dangerous\n"
-msgstr "Opozorilo: poganjanje q-agent setuid na tem sistemu je nevarno\n"
-
-#~ msgid "There was an error launching the preferences dialog: %s"
-#~ msgstr "Prišlo je do napake med zagonom pogovornega okna možnosti: %s"
-
-#~ msgid "Kerberos;Authentication"
-#~ msgstr "Kerberos;Overitev"
-
-#~ msgid "Set your Kerberos network authentication preferences"
-#~ msgstr "Nastavitev možnosti Kerberos overitve omrežja"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:18
+msgid "Notify user when ticket becomes valid"
+msgstr "Obvesti uporabnika, ko vstopnica postane veljavna"
 
-#~ msgid "Applet"
-#~ msgstr "Aplet"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:19
+msgid "ticket expiring notification"
+msgstr "obvestilo o pretekanju vstopnice"
 
-#~ msgid "Network Authentication"
-#~ msgstr "Overitev omrežja"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:20
+msgid "Notify user when ticket is about to expire"
+msgstr "Obvesti uporabnika, ko bo vstopnica potekla"
 
-#~ msgid "Show a trayicon in the status area of the panel"
-#~ msgstr "Prikaz ikone sistemske vrstice v področju stanja na pultu"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:21
+msgid "ticket expired notification"
+msgstr "obvestilo potekle vstopnice"
 
-#~ msgid "Show trayicon"
-#~ msgstr "Pokaži ikono sistemske vrstice"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:22
+msgid "Notify user when ticket has expired"
+msgstr "Obvesti uporabnika ob poteku vstopnice"
 
-#~ msgid "Appearance"
-#~ msgstr "Videz"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:23
+msgid "Enabled plugins"
+msgstr "Omogočeni vstavki"
 
-#~ msgid "If checked, display the tray icon in the status bar"
-#~ msgstr ""
-#~ "Izbrana možnost določi prikaz ikone sistemske vrstice v vrstici stanja"
+#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:24
+msgid "List of plugins that should be loaded and activated on startup."
+msgstr "Seznam vstavkov, ki bodo naloženi in omogočeni ob zagonu."
 
-#~ msgid "Show tray icon"
-#~ msgstr "Pokaži ikono sistemske vrstice"
+#: ../secmem/util.c:106
+#, c-format
+msgid "Warning: running q-agent setuid on this system is dangerous\n"
+msgstr "Opozorilo: poganjanje q-agent setuid na tem sistemu je nevarno\n"
 
-#~ msgid ""
-#~ "There was an error displaying %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Prišlo je do napake med prikazovanjem %s:\n"
-#~ "%s"
diff --git a/secmem/Makefile.in b/secmem/Makefile.in
index 135ea6e..1e6f6db 100644
--- a/secmem/Makefile.in
+++ b/secmem/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,6 +35,23 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -67,11 +84,11 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
-AM_V_AR = $(am__v_AR_$(V))
-am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 am__v_AR_0 = @echo "  AR    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 libsecmem_a_AR = $(AR) $(ARFLAGS)
 libsecmem_a_LIBADD =
@@ -83,28 +100,33 @@ am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libsecmem_a_SOURCES)
 DIST_SOURCES = $(libsecmem_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -140,19 +162,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -167,6 +186,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -257,6 +280,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -266,6 +290,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -332,7 +358,7 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libsecmem.a: $(libsecmem_a_OBJECTS) $(libsecmem_a_DEPENDENCIES) 
+libsecmem.a: $(libsecmem_a_OBJECTS) $(libsecmem_a_DEPENDENCIES) $(EXTRA_libsecmem_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libsecmem.a
 	$(AM_V_AR)$(libsecmem_a_AR) libsecmem.a $(libsecmem_a_OBJECTS) $(libsecmem_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libsecmem.a
@@ -349,26 +375,23 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -472,10 +495,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c22dcf..3cf1a7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,10 +12,11 @@ desktopdir = $(datadir)/applications
 desktop_in_files = krb5-auth-dialog.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = krb5-auth-dialog.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+gsettings_SCHEMAS = org.gnome.KrbAuthDialog.gschema.xml
+@GSETTINGS_RULES@
+
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = org.gnome.KrbAuthDialog.convert
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.gnome.KrbAuthDialog.service.in
@@ -32,10 +33,8 @@ krb5_auth_dialog_SOURCES =	\
 	ka-applet.h		\
 	ka-pwdialog.c    	\
 	ka-pwdialog.h    	\
-	ka-gconf.c		\
-	ka-gconf.h		\
-	ka-gconf-tools.c	\
-	ka-gconf-tools.h	\
+	ka-settings.c		\
+	ka-settings.h		\
 	ka-dbus.c		\
 	ka-dbus.h		\
 	ka-tools.c		\
@@ -68,7 +67,6 @@ krb5_auth_dialog_CPPFLAGS = \
 krb5_auth_dialog_CFLAGS = \
 	$(GMODULE_CFLAGS) \
 	$(GTK_CFLAGS) \
-	$(GCONF_CFLAGS) \
 	$(KRB5_CFLAGS) \
 	$(NETWORK_MANAGER_CFLAGS) \
 	$(LIBNOTIFY_CFLAGS) \
@@ -82,7 +80,6 @@ krb5_auth_dialog_LDADD = \
 	$(LIBCAP) \
 	$(KRB5_LIBS) \
 	$(LIBNOTIFY_LIBS) \
-	$(GCONF_LIBS) \
 	$(GIO_LIBS) \
 	$(GMODULE_LIBS) \
 	$(GTK_LIBS) \
@@ -103,6 +100,7 @@ EXTRA_DIST = \
 	$(schema_in_files) \
 	$(autostart_in_files) \
 	$(service_in_files) \
+	org.gnome.KrbAuthDialog.gschema.xml \
 	krb5-auth-dialog.1.in \
 	$(NULL)
 
@@ -111,12 +109,3 @@ DISTCLEANFILES = \
 	krb5-auth-dialog.desktop \
 	$(NULL)
 
-install-data-local: $(schema_DATA)
-if GCONF_SCHEMAS_INSTALL
-	if test -z "$(DESTDIR)" ; then \
-	for p in $^ ; do \
-		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
-	done \
-	fi
-endif
-
diff --git a/src/Makefile.in b/src/Makefile.in
index f4a24be..dc2bf38 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -36,8 +53,8 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = krb5-auth-dialog$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/krb5-auth-dialog.1.in
+DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/krb5-auth-dialog.1.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/m4/compiler-flags.m4 \
@@ -50,15 +67,14 @@ CONFIG_CLEAN_FILES = krb5-auth-dialog.1
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" \
-	"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(schemadir)" \
+	"$(DESTDIR)$(convertdir)" "$(DESTDIR)$(pkgdatadir)" \
 	"$(DESTDIR)$(servicedir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__objects_1 =
 am_krb5_auth_dialog_OBJECTS = krb5_auth_dialog-ka-kerberos.$(OBJEXT) \
 	krb5_auth_dialog-ka-applet.$(OBJEXT) \
 	krb5_auth_dialog-ka-pwdialog.$(OBJEXT) \
-	krb5_auth_dialog-ka-gconf.$(OBJEXT) \
-	krb5_auth_dialog-ka-gconf-tools.$(OBJEXT) \
+	krb5_auth_dialog-ka-settings.$(OBJEXT) \
 	krb5_auth_dialog-ka-dbus.$(OBJEXT) \
 	krb5_auth_dialog-ka-tools.$(OBJEXT) \
 	krb5_auth_dialog-ka-main-window.$(OBJEXT) \
@@ -74,10 +90,9 @@ krb5_auth_dialog_DEPENDENCIES = $(top_builddir)/secmem/libsecmem.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 krb5_auth_dialog_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -93,24 +108,29 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(krb5_auth_dialog_SOURCES)
 DIST_SOURCES = $(krb5_auth_dialog_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -132,11 +152,17 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
-DATA = $(autostart_DATA) $(desktop_DATA) $(pkgdata_DATA) \
-	$(schema_DATA) $(service_DATA)
+DATA = $(autostart_DATA) $(desktop_DATA) $(dist_convert_DATA) \
+	$(pkgdata_DATA) $(service_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -173,19 +199,16 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -200,6 +223,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 KA_PLUGINS_DIR = @KA_PLUGINS_DIR@
 KRB5_CFLAGS = @KRB5_CFLAGS@
 KRB5_CONFIG = @KRB5_CONFIG@
@@ -290,6 +317,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -299,6 +327,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -327,9 +357,9 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_in_files = krb5-auth-dialog.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = krb5-auth-dialog.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+gsettings_SCHEMAS = org.gnome.KrbAuthDialog.gschema.xml
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = org.gnome.KrbAuthDialog.convert
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gnome.KrbAuthDialog.service.in
 service_DATA = $(service_in_files:.service.in=.service)
@@ -341,10 +371,8 @@ krb5_auth_dialog_SOURCES = \
 	ka-applet.h		\
 	ka-pwdialog.c    	\
 	ka-pwdialog.h    	\
-	ka-gconf.c		\
-	ka-gconf.h		\
-	ka-gconf-tools.c	\
-	ka-gconf-tools.h	\
+	ka-settings.c		\
+	ka-settings.h		\
 	ka-dbus.c		\
 	ka-dbus.h		\
 	ka-tools.c		\
@@ -377,7 +405,6 @@ krb5_auth_dialog_CPPFLAGS = \
 krb5_auth_dialog_CFLAGS = \
 	$(GMODULE_CFLAGS) \
 	$(GTK_CFLAGS) \
-	$(GCONF_CFLAGS) \
 	$(KRB5_CFLAGS) \
 	$(NETWORK_MANAGER_CFLAGS) \
 	$(LIBNOTIFY_CFLAGS) \
@@ -391,7 +418,6 @@ krb5_auth_dialog_LDADD = \
 	$(LIBCAP) \
 	$(KRB5_LIBS) \
 	$(LIBNOTIFY_LIBS) \
-	$(GCONF_LIBS) \
 	$(GIO_LIBS) \
 	$(GMODULE_LIBS) \
 	$(GTK_LIBS) \
@@ -411,6 +437,7 @@ EXTRA_DIST = \
 	$(schema_in_files) \
 	$(autostart_in_files) \
 	$(service_in_files) \
+	org.gnome.KrbAuthDialog.gschema.xml \
 	krb5-auth-dialog.1.in \
 	$(NULL)
 
@@ -457,8 +484,11 @@ krb5-auth-dialog.1: $(top_builddir)/config.status $(srcdir)/krb5-auth-dialog.1.i
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -498,7 +528,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-krb5-auth-dialog$(EXEEXT): $(krb5_auth_dialog_OBJECTS) $(krb5_auth_dialog_DEPENDENCIES) 
+krb5-auth-dialog$(EXEEXT): $(krb5_auth_dialog_OBJECTS) $(krb5_auth_dialog_DEPENDENCIES) $(EXTRA_krb5_auth_dialog_DEPENDENCIES) 
 	@rm -f krb5-auth-dialog$(EXEEXT)
 	$(AM_V_CCLD)$(krb5_auth_dialog_LINK) $(krb5_auth_dialog_OBJECTS) $(krb5_auth_dialog_LDADD) $(LIBS)
 
@@ -513,263 +543,217 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-closures.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-dbus.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-gconf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-kerberos.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-main-window.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-plugin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-preferences.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-settings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-tools.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 krb5_auth_dialog-ka-kerberos.o: ka-kerberos.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-kerberos.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo -c -o krb5_auth_dialog-ka-kerberos.o `test -f 'ka-kerberos.c' || echo '$(srcdir)/'`ka-kerberos.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-kerberos.c' object='krb5_auth_dialog-ka-kerberos.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-kerberos.c' object='krb5_auth_dialog-ka-kerberos.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-kerberos.o `test -f 'ka-kerberos.c' || echo '$(srcdir)/'`ka-kerberos.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-kerberos.o `test -f 'ka-kerberos.c' || echo '$(srcdir)/'`ka-kerberos.c
 
 krb5_auth_dialog-ka-kerberos.obj: ka-kerberos.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-kerberos.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo -c -o krb5_auth_dialog-ka-kerberos.obj `if test -f 'ka-kerberos.c'; then $(CYGPATH_W) 'ka-kerberos.c'; else $(CYGPATH_W) '$(srcdir)/ka-kerberos.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Tpo $(DEPDIR)/krb5_auth_dialog-ka-kerberos.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-kerberos.c' object='krb5_auth_dialog-ka-kerberos.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-kerberos.c' object='krb5_auth_dialog-ka-kerberos.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-kerberos.obj `if test -f 'ka-kerberos.c'; then $(CYGPATH_W) 'ka-kerberos.c'; else $(CYGPATH_W) '$(srcdir)/ka-kerberos.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-kerberos.obj `if test -f 'ka-kerberos.c'; then $(CYGPATH_W) 'ka-kerberos.c'; else $(CYGPATH_W) '$(srcdir)/ka-kerberos.c'; fi`
 
 krb5_auth_dialog-ka-applet.o: ka-applet.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-applet.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo -c -o krb5_auth_dialog-ka-applet.o `test -f 'ka-applet.c' || echo '$(srcdir)/'`ka-applet.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo $(DEPDIR)/krb5_auth_dialog-ka-applet.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-applet.c' object='krb5_auth_dialog-ka-applet.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-applet.c' object='krb5_auth_dialog-ka-applet.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-applet.o `test -f 'ka-applet.c' || echo '$(srcdir)/'`ka-applet.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-applet.o `test -f 'ka-applet.c' || echo '$(srcdir)/'`ka-applet.c
 
 krb5_auth_dialog-ka-applet.obj: ka-applet.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-applet.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo -c -o krb5_auth_dialog-ka-applet.obj `if test -f 'ka-applet.c'; then $(CYGPATH_W) 'ka-applet.c'; else $(CYGPATH_W) '$(srcdir)/ka-applet.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo $(DEPDIR)/krb5_auth_dialog-ka-applet.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-applet.c' object='krb5_auth_dialog-ka-applet.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-applet.c' object='krb5_auth_dialog-ka-applet.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-applet.obj `if test -f 'ka-applet.c'; then $(CYGPATH_W) 'ka-applet.c'; else $(CYGPATH_W) '$(srcdir)/ka-applet.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-applet.obj `if test -f 'ka-applet.c'; then $(CYGPATH_W) 'ka-applet.c'; else $(CYGPATH_W) '$(srcdir)/ka-applet.c'; fi`
 
 krb5_auth_dialog-ka-pwdialog.o: ka-pwdialog.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-pwdialog.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo -c -o krb5_auth_dialog-ka-pwdialog.o `test -f 'ka-pwdialog.c' || echo '$(srcdir)/'`ka-pwdialog.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-pwdialog.c' object='krb5_auth_dialog-ka-pwdialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-pwdialog.c' object='krb5_auth_dialog-ka-pwdialog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-pwdialog.o `test -f 'ka-pwdialog.c' || echo '$(srcdir)/'`ka-pwdialog.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-pwdialog.o `test -f 'ka-pwdialog.c' || echo '$(srcdir)/'`ka-pwdialog.c
 
 krb5_auth_dialog-ka-pwdialog.obj: ka-pwdialog.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-pwdialog.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo -c -o krb5_auth_dialog-ka-pwdialog.obj `if test -f 'ka-pwdialog.c'; then $(CYGPATH_W) 'ka-pwdialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-pwdialog.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-pwdialog.c' object='krb5_auth_dialog-ka-pwdialog.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-pwdialog.obj `if test -f 'ka-pwdialog.c'; then $(CYGPATH_W) 'ka-pwdialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-pwdialog.c'; fi`
-
-krb5_auth_dialog-ka-gconf.o: ka-gconf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-gconf.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo -c -o krb5_auth_dialog-ka-gconf.o `test -f 'ka-gconf.c' || echo '$(srcdir)/'`ka-gconf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-gconf.c' object='krb5_auth_dialog-ka-gconf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-pwdialog.c' object='krb5_auth_dialog-ka-pwdialog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-gconf.o `test -f 'ka-gconf.c' || echo '$(srcdir)/'`ka-gconf.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-pwdialog.obj `if test -f 'ka-pwdialog.c'; then $(CYGPATH_W) 'ka-pwdialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-pwdialog.c'; fi`
 
-krb5_auth_dialog-ka-gconf.obj: ka-gconf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-gconf.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo -c -o krb5_auth_dialog-ka-gconf.obj `if test -f 'ka-gconf.c'; then $(CYGPATH_W) 'ka-gconf.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-gconf.c' object='krb5_auth_dialog-ka-gconf.obj' libtool=no @AMDEPBACKSLASH@
+krb5_auth_dialog-ka-settings.o: ka-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-settings.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-settings.Tpo -c -o krb5_auth_dialog-ka-settings.o `test -f 'ka-settings.c' || echo '$(srcdir)/'`ka-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-settings.Tpo $(DEPDIR)/krb5_auth_dialog-ka-settings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-settings.c' object='krb5_auth_dialog-ka-settings.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-gconf.obj `if test -f 'ka-gconf.c'; then $(CYGPATH_W) 'ka-gconf.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-settings.o `test -f 'ka-settings.c' || echo '$(srcdir)/'`ka-settings.c
 
-krb5_auth_dialog-ka-gconf-tools.o: ka-gconf-tools.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-gconf-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo -c -o krb5_auth_dialog-ka-gconf-tools.o `test -f 'ka-gconf-tools.c' || echo '$(srcdir)/'`ka-gconf-tools.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-gconf-tools.c' object='krb5_auth_dialog-ka-gconf-tools.o' libtool=no @AMDEPBACKSLASH@
+krb5_auth_dialog-ka-settings.obj: ka-settings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-settings.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-settings.Tpo -c -o krb5_auth_dialog-ka-settings.obj `if test -f 'ka-settings.c'; then $(CYGPATH_W) 'ka-settings.c'; else $(CYGPATH_W) '$(srcdir)/ka-settings.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-settings.Tpo $(DEPDIR)/krb5_auth_dialog-ka-settings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-settings.c' object='krb5_auth_dialog-ka-settings.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-gconf-tools.o `test -f 'ka-gconf-tools.c' || echo '$(srcdir)/'`ka-gconf-tools.c
-
-krb5_auth_dialog-ka-gconf-tools.obj: ka-gconf-tools.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-gconf-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo -c -o krb5_auth_dialog-ka-gconf-tools.obj `if test -f 'ka-gconf-tools.c'; then $(CYGPATH_W) 'ka-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf-tools.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-gconf-tools.c' object='krb5_auth_dialog-ka-gconf-tools.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-gconf-tools.obj `if test -f 'ka-gconf-tools.c'; then $(CYGPATH_W) 'ka-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf-tools.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-settings.obj `if test -f 'ka-settings.c'; then $(CYGPATH_W) 'ka-settings.c'; else $(CYGPATH_W) '$(srcdir)/ka-settings.c'; fi`
 
 krb5_auth_dialog-ka-dbus.o: ka-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-dbus.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo -c -o krb5_auth_dialog-ka-dbus.o `test -f 'ka-dbus.c' || echo '$(srcdir)/'`ka-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-dbus.c' object='krb5_auth_dialog-ka-dbus.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-dbus.c' object='krb5_auth_dialog-ka-dbus.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dbus.o `test -f 'ka-dbus.c' || echo '$(srcdir)/'`ka-dbus.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dbus.o `test -f 'ka-dbus.c' || echo '$(srcdir)/'`ka-dbus.c
 
 krb5_auth_dialog-ka-dbus.obj: ka-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-dbus.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo -c -o krb5_auth_dialog-ka-dbus.obj `if test -f 'ka-dbus.c'; then $(CYGPATH_W) 'ka-dbus.c'; else $(CYGPATH_W) '$(srcdir)/ka-dbus.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-dbus.c' object='krb5_auth_dialog-ka-dbus.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-dbus.c' object='krb5_auth_dialog-ka-dbus.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dbus.obj `if test -f 'ka-dbus.c'; then $(CYGPATH_W) 'ka-dbus.c'; else $(CYGPATH_W) '$(srcdir)/ka-dbus.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dbus.obj `if test -f 'ka-dbus.c'; then $(CYGPATH_W) 'ka-dbus.c'; else $(CYGPATH_W) '$(srcdir)/ka-dbus.c'; fi`
 
 krb5_auth_dialog-ka-tools.o: ka-tools.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo -c -o krb5_auth_dialog-ka-tools.o `test -f 'ka-tools.c' || echo '$(srcdir)/'`ka-tools.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tools.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-tools.c' object='krb5_auth_dialog-ka-tools.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-tools.c' object='krb5_auth_dialog-ka-tools.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tools.o `test -f 'ka-tools.c' || echo '$(srcdir)/'`ka-tools.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tools.o `test -f 'ka-tools.c' || echo '$(srcdir)/'`ka-tools.c
 
 krb5_auth_dialog-ka-tools.obj: ka-tools.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo -c -o krb5_auth_dialog-ka-tools.obj `if test -f 'ka-tools.c'; then $(CYGPATH_W) 'ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-tools.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tools.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-tools.c' object='krb5_auth_dialog-ka-tools.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-tools.c' object='krb5_auth_dialog-ka-tools.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tools.obj `if test -f 'ka-tools.c'; then $(CYGPATH_W) 'ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-tools.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tools.obj `if test -f 'ka-tools.c'; then $(CYGPATH_W) 'ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-tools.c'; fi`
 
 krb5_auth_dialog-ka-main-window.o: ka-main-window.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-main-window.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo -c -o krb5_auth_dialog-ka-main-window.o `test -f 'ka-main-window.c' || echo '$(srcdir)/'`ka-main-window.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo $(DEPDIR)/krb5_auth_dialog-ka-main-window.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-main-window.c' object='krb5_auth_dialog-ka-main-window.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-main-window.c' object='krb5_auth_dialog-ka-main-window.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-main-window.o `test -f 'ka-main-window.c' || echo '$(srcdir)/'`ka-main-window.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-main-window.o `test -f 'ka-main-window.c' || echo '$(srcdir)/'`ka-main-window.c
 
 krb5_auth_dialog-ka-main-window.obj: ka-main-window.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-main-window.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo -c -o krb5_auth_dialog-ka-main-window.obj `if test -f 'ka-main-window.c'; then $(CYGPATH_W) 'ka-main-window.c'; else $(CYGPATH_W) '$(srcdir)/ka-main-window.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-main-window.Tpo $(DEPDIR)/krb5_auth_dialog-ka-main-window.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-main-window.c' object='krb5_auth_dialog-ka-main-window.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-main-window.c' object='krb5_auth_dialog-ka-main-window.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-main-window.obj `if test -f 'ka-main-window.c'; then $(CYGPATH_W) 'ka-main-window.c'; else $(CYGPATH_W) '$(srcdir)/ka-main-window.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-main-window.obj `if test -f 'ka-main-window.c'; then $(CYGPATH_W) 'ka-main-window.c'; else $(CYGPATH_W) '$(srcdir)/ka-main-window.c'; fi`
 
 krb5_auth_dialog-ka-plugin.o: ka-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-plugin.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo -c -o krb5_auth_dialog-ka-plugin.o `test -f 'ka-plugin.c' || echo '$(srcdir)/'`ka-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin.c' object='krb5_auth_dialog-ka-plugin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin.c' object='krb5_auth_dialog-ka-plugin.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin.o `test -f 'ka-plugin.c' || echo '$(srcdir)/'`ka-plugin.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin.o `test -f 'ka-plugin.c' || echo '$(srcdir)/'`ka-plugin.c
 
 krb5_auth_dialog-ka-plugin.obj: ka-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-plugin.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo -c -o krb5_auth_dialog-ka-plugin.obj `if test -f 'ka-plugin.c'; then $(CYGPATH_W) 'ka-plugin.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin.c' object='krb5_auth_dialog-ka-plugin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin.c' object='krb5_auth_dialog-ka-plugin.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin.obj `if test -f 'ka-plugin.c'; then $(CYGPATH_W) 'ka-plugin.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin.obj `if test -f 'ka-plugin.c'; then $(CYGPATH_W) 'ka-plugin.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin.c'; fi`
 
 krb5_auth_dialog-ka-plugin-loader.o: ka-plugin-loader.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-plugin-loader.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo -c -o krb5_auth_dialog-ka-plugin-loader.o `test -f 'ka-plugin-loader.c' || echo '$(srcdir)/'`ka-plugin-loader.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin-loader.c' object='krb5_auth_dialog-ka-plugin-loader.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin-loader.c' object='krb5_auth_dialog-ka-plugin-loader.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin-loader.o `test -f 'ka-plugin-loader.c' || echo '$(srcdir)/'`ka-plugin-loader.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin-loader.o `test -f 'ka-plugin-loader.c' || echo '$(srcdir)/'`ka-plugin-loader.c
 
 krb5_auth_dialog-ka-plugin-loader.obj: ka-plugin-loader.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-plugin-loader.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo -c -o krb5_auth_dialog-ka-plugin-loader.obj `if test -f 'ka-plugin-loader.c'; then $(CYGPATH_W) 'ka-plugin-loader.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin-loader.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-plugin-loader.c' object='krb5_auth_dialog-ka-plugin-loader.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-plugin-loader.c' object='krb5_auth_dialog-ka-plugin-loader.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin-loader.obj `if test -f 'ka-plugin-loader.c'; then $(CYGPATH_W) 'ka-plugin-loader.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin-loader.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin-loader.obj `if test -f 'ka-plugin-loader.c'; then $(CYGPATH_W) 'ka-plugin-loader.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin-loader.c'; fi`
 
 krb5_auth_dialog-ka-preferences.o: ka-preferences.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-preferences.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo -c -o krb5_auth_dialog-ka-preferences.o `test -f 'ka-preferences.c' || echo '$(srcdir)/'`ka-preferences.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo $(DEPDIR)/krb5_auth_dialog-ka-preferences.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-preferences.c' object='krb5_auth_dialog-ka-preferences.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-preferences.c' object='krb5_auth_dialog-ka-preferences.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-preferences.o `test -f 'ka-preferences.c' || echo '$(srcdir)/'`ka-preferences.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-preferences.o `test -f 'ka-preferences.c' || echo '$(srcdir)/'`ka-preferences.c
 
 krb5_auth_dialog-ka-preferences.obj: ka-preferences.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-preferences.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo -c -o krb5_auth_dialog-ka-preferences.obj `if test -f 'ka-preferences.c'; then $(CYGPATH_W) 'ka-preferences.c'; else $(CYGPATH_W) '$(srcdir)/ka-preferences.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-preferences.Tpo $(DEPDIR)/krb5_auth_dialog-ka-preferences.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-preferences.c' object='krb5_auth_dialog-ka-preferences.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-preferences.c' object='krb5_auth_dialog-ka-preferences.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-preferences.obj `if test -f 'ka-preferences.c'; then $(CYGPATH_W) 'ka-preferences.c'; else $(CYGPATH_W) '$(srcdir)/ka-preferences.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-preferences.obj `if test -f 'ka-preferences.c'; then $(CYGPATH_W) 'ka-preferences.c'; else $(CYGPATH_W) '$(srcdir)/ka-preferences.c'; fi`
 
 krb5_auth_dialog-ka-closures.o: ka-closures.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-closures.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo -c -o krb5_auth_dialog-ka-closures.o `test -f 'ka-closures.c' || echo '$(srcdir)/'`ka-closures.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo $(DEPDIR)/krb5_auth_dialog-ka-closures.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-closures.c' object='krb5_auth_dialog-ka-closures.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-closures.c' object='krb5_auth_dialog-ka-closures.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-closures.o `test -f 'ka-closures.c' || echo '$(srcdir)/'`ka-closures.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-closures.o `test -f 'ka-closures.c' || echo '$(srcdir)/'`ka-closures.c
 
 krb5_auth_dialog-ka-closures.obj: ka-closures.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-closures.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo -c -o krb5_auth_dialog-ka-closures.obj `if test -f 'ka-closures.c'; then $(CYGPATH_W) 'ka-closures.c'; else $(CYGPATH_W) '$(srcdir)/ka-closures.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo $(DEPDIR)/krb5_auth_dialog-ka-closures.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-closures.c' object='krb5_auth_dialog-ka-closures.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-closures.c' object='krb5_auth_dialog-ka-closures.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-closures.obj `if test -f 'ka-closures.c'; then $(CYGPATH_W) 'ka-closures.c'; else $(CYGPATH_W) '$(srcdir)/ka-closures.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-closures.obj `if test -f 'ka-closures.c'; then $(CYGPATH_W) 'ka-closures.c'; else $(CYGPATH_W) '$(srcdir)/ka-closures.c'; fi`
 
 krb5_auth_dialog-ka-entry-buffer.o: ka-entry-buffer.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-entry-buffer.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Tpo -c -o krb5_auth_dialog-ka-entry-buffer.o `test -f 'ka-entry-buffer.c' || echo '$(srcdir)/'`ka-entry-buffer.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Tpo $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-entry-buffer.c' object='krb5_auth_dialog-ka-entry-buffer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-entry-buffer.c' object='krb5_auth_dialog-ka-entry-buffer.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-entry-buffer.o `test -f 'ka-entry-buffer.c' || echo '$(srcdir)/'`ka-entry-buffer.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-entry-buffer.o `test -f 'ka-entry-buffer.c' || echo '$(srcdir)/'`ka-entry-buffer.c
 
 krb5_auth_dialog-ka-entry-buffer.obj: ka-entry-buffer.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-entry-buffer.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Tpo -c -o krb5_auth_dialog-ka-entry-buffer.obj `if test -f 'ka-entry-buffer.c'; then $(CYGPATH_W) 'ka-entry-buffer.c'; else $(CYGPATH_W) '$(srcdir)/ka-entry-buffer.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Tpo $(DEPDIR)/krb5_auth_dialog-ka-entry-buffer.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ka-entry-buffer.c' object='krb5_auth_dialog-ka-entry-buffer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ka-entry-buffer.c' object='krb5_auth_dialog-ka-entry-buffer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-entry-buffer.obj `if test -f 'ka-entry-buffer.c'; then $(CYGPATH_W) 'ka-entry-buffer.c'; else $(CYGPATH_W) '$(srcdir)/ka-entry-buffer.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-entry-buffer.obj `if test -f 'ka-entry-buffer.c'; then $(CYGPATH_W) 'ka-entry-buffer.c'; else $(CYGPATH_W) '$(srcdir)/ka-entry-buffer.c'; fi`
 
 krb5_auth_dialog-dummy-strings.o: dummy-strings.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-dummy-strings.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo -c -o krb5_auth_dialog-dummy-strings.o `test -f 'dummy-strings.c' || echo '$(srcdir)/'`dummy-strings.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo $(DEPDIR)/krb5_auth_dialog-dummy-strings.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dummy-strings.c' object='krb5_auth_dialog-dummy-strings.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dummy-strings.c' object='krb5_auth_dialog-dummy-strings.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-dummy-strings.o `test -f 'dummy-strings.c' || echo '$(srcdir)/'`dummy-strings.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-dummy-strings.o `test -f 'dummy-strings.c' || echo '$(srcdir)/'`dummy-strings.c
 
 krb5_auth_dialog-dummy-strings.obj: dummy-strings.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-dummy-strings.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo -c -o krb5_auth_dialog-dummy-strings.obj `if test -f 'dummy-strings.c'; then $(CYGPATH_W) 'dummy-strings.c'; else $(CYGPATH_W) '$(srcdir)/dummy-strings.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo $(DEPDIR)/krb5_auth_dialog-dummy-strings.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dummy-strings.c' object='krb5_auth_dialog-dummy-strings.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dummy-strings.c' object='krb5_auth_dialog-dummy-strings.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-dummy-strings.obj `if test -f 'dummy-strings.c'; then $(CYGPATH_W) 'dummy-strings.c'; else $(CYGPATH_W) '$(srcdir)/dummy-strings.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-dummy-strings.obj `if test -f 'dummy-strings.c'; then $(CYGPATH_W) 'dummy-strings.c'; else $(CYGPATH_W) '$(srcdir)/dummy-strings.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -778,11 +762,18 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -811,13 +802,14 @@ uninstall-man1:
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-autostartDATA: $(autostart_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(autostartdir)" || $(MKDIR_P) "$(DESTDIR)$(autostartdir)"
 	@list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(autostartdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(autostartdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -831,13 +823,14 @@ uninstall-autostartDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(autostartdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(autostartdir)" && rm -f $$files
+	dir='$(DESTDIR)$(autostartdir)'; $(am__uninstall_files_from_dir)
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -851,53 +844,56 @@ uninstall-desktopDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
-install-pkgdataDATA: $(pkgdata_DATA)
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+install-dist_convertDATA: $(dist_convert_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	@list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(convertdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(convertdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(convertdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(convertdir)" || exit $$?; \
 	done
 
-uninstall-pkgdataDATA:
+uninstall-dist_convertDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	@list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-install-schemaDATA: $(schema_DATA)
+	dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir)
+install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
-	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
+	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
 	done
 
-uninstall-schemaDATA:
+uninstall-pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
+	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(schemadir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -911,9 +907,7 @@ uninstall-serviceDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(servicedir)" && rm -f $$files
+	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1014,7 +1008,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(servicedir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(servicedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -1027,10 +1021,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1066,9 +1065,9 @@ info: info-am
 
 info-am:
 
-install-data-am: install-autostartDATA install-data-local \
-	install-desktopDATA install-man install-pkgdataDATA \
-	install-schemaDATA install-serviceDATA
+install-data-am: install-autostartDATA install-desktopDATA \
+	install-dist_convertDATA install-man install-pkgdataDATA \
+	install-serviceDATA
 
 install-dvi: install-dvi-am
 
@@ -1115,8 +1114,8 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-autostartDATA uninstall-binPROGRAMS \
-	uninstall-desktopDATA uninstall-man uninstall-pkgdataDATA \
-	uninstall-schemaDATA uninstall-serviceDATA
+	uninstall-desktopDATA uninstall-dist_convertDATA uninstall-man \
+	uninstall-pkgdataDATA uninstall-serviceDATA
 
 uninstall-man: uninstall-man1
 
@@ -1127,33 +1126,25 @@ uninstall-man: uninstall-man1
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-autostartDATA install-binPROGRAMS install-data \
-	install-data-am install-data-local install-desktopDATA \
+	install-data-am install-desktopDATA install-dist_convertDATA \
 	install-dvi install-dvi-am install-exec install-exec-am \
 	install-html install-html-am install-info install-info-am \
 	install-man install-man1 install-pdf install-pdf-am \
 	install-pkgdataDATA install-ps install-ps-am \
-	install-schemaDATA install-serviceDATA install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-autostartDATA \
-	uninstall-binPROGRAMS uninstall-desktopDATA uninstall-man \
-	uninstall-man1 uninstall-pkgdataDATA uninstall-schemaDATA \
-	uninstall-serviceDATA
+	install-serviceDATA install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-autostartDATA uninstall-binPROGRAMS \
+	uninstall-desktopDATA uninstall-dist_convertDATA uninstall-man \
+	uninstall-man1 uninstall-pkgdataDATA uninstall-serviceDATA
 
 @INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_SCHEMAS_RULE@
+@GSETTINGS_RULES@
 
 $(service_DATA): $(service_in_files) Makefile
 	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
 
-install-data-local: $(schema_DATA)
-@GCONF_SCHEMAS_INSTALL_TRUE@	if test -z "$(DESTDIR)" ; then \
-@GCONF_SCHEMAS_INSTALL_TRUE@	for p in $^ ; do \
-@GCONF_SCHEMAS_INSTALL_TRUE@		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
-@GCONF_SCHEMAS_INSTALL_TRUE@	done \
-@GCONF_SCHEMAS_INSTALL_TRUE@	fi
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/ka-applet-priv.h b/src/ka-applet-priv.h
index d571230..ffcb4a4 100644
--- a/src/ka-applet-priv.h
+++ b/src/ka-applet-priv.h
@@ -25,7 +25,6 @@
 
 #include <glib-object.h>
 #include <glib/gprintf.h>
-#include <gconf/gconf-client.h>
 #include <krb5.h>
 
 #include "config.h"
@@ -52,11 +51,21 @@ void ka_applet_set_tgt_renewable (KaApplet *self, gboolean renewable);
 gboolean ka_applet_get_tgt_renewable (const KaApplet *self);
 guint ka_applet_get_pw_prompt_secs (const KaApplet *self);
 KaPwDialog *ka_applet_get_pwdialog (const KaApplet *self);
-GConfClient *ka_applet_get_gconf_client (const KaApplet *self);
+GSettings *ka_applet_get_settings (const KaApplet *self);
 void ka_applet_signal_emit (KaApplet *self, KaAppletSignalNumber signum,
                             krb5_timestamp expiry);
 void ka_applet_set_msg (KaApplet *self, const char *msg);
+GtkWindow* ka_applet_last_focused_window(KaApplet *self);
 
+/* properties */
+#define KA_PROP_NAME_PRINCIPAL       "principal"
+#define KA_PROP_NAME_PK_USERID       "pk-userid"
+#define KA_PROP_NAME_PK_ANCHORS      "pk-anchors"
+#define KA_PROP_NAME_PW_PROMPT_MINS  "pw-prompt-mins"
+#define KA_PROP_NAME_TGT_FORWARDABLE "tgt-forwardable"
+#define KA_PROP_NAME_TGT_PROXIABLE   "tgt-proxiable"
+#define KA_PROP_NAME_TGT_RENEWABLE   "tgt-renewable"
+#define KA_PROP_NAME_CONF_TICKETS    "conf-tickets"
 
 /* create the applet */
 KaApplet *ka_applet_create (void);
diff --git a/src/ka-applet.c b/src/ka-applet.c
index 56d4b14..2b48825 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -1,6 +1,6 @@
 /* Krb5 Auth Applet -- Acquire and release kerberos tickets
  *
- * (C) 2008,2009,2010 Guido Guenther <agx@sigxcpu.org>
+ * (C) 2008,2009,2010,2013 Guido Guenther <agx@sigxcpu.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,8 +25,7 @@
 #include "ka-applet-priv.h"
 #include "ka-dbus.h"
 #include "ka-kerberos.h"
-#include "ka-gconf-tools.h"
-#include "ka-gconf.h"
+#include "ka-settings.h"
 #include "ka-tools.h"
 #include "ka-main-window.h"
 #include "ka-plugin-loader.h"
@@ -51,6 +50,7 @@ enum {
     KA_PROP_TGT_FORWARDABLE,
     KA_PROP_TGT_PROXIABLE,
     KA_PROP_TGT_RENEWABLE,
+    KA_PROP_CONF_TICKETS,
 };
 
 
@@ -91,10 +91,10 @@ struct _KaAppletPrivate {
     gboolean startup_ccache;    /* ccache found on startup */
     gboolean auto_run;          /* only start with valid ccache */
 
-    /* GConf optins */
+    /* GSettings options */
     NotifyNotification *notification;   /* notification messages */
     char *krb_msg;              /* Additional banner delivered by Kerberos */
-    const char *notify_gconf_key;       /* disable notification gconf key */
+    const char *notify_key;     /* name of disable notification setting key */
     char *principal;            /* the principal to request */
     gboolean renewable;         /* credentials renewable? */
     char *pk_userid;            /* "userid" for pkint */
@@ -102,20 +102,23 @@ struct _KaAppletPrivate {
     gboolean tgt_forwardable;   /* request a forwardable ticket */
     gboolean tgt_renewable;     /* request a renewable ticket */
     gboolean tgt_proxiable;     /* request a proxiable ticket */
+    gboolean conf_tickets;      /* whether to display configuration tickets */
 
-    GConfClient *gconf;         /* gconf client */
+    GSettings *settings;         /* GSettings client */
 };
 
 
 static void ka_close_notification (KaApplet *self);
 static gboolean is_initialized;
 
-static void 
+static void
 ka_applet_activate (GApplication *application G_GNUC_UNUSED)
 {
+    KaApplet *self = KA_APPLET(application);
+
     if (is_initialized) {
         KA_DEBUG ("Main window activated");
-        ka_main_window_show ();
+        ka_main_window_show (self);
     } else
         is_initialized = TRUE;
 }
@@ -127,7 +130,7 @@ ka_applet_command_line (GApplication            *application,
 {
     KaApplet *self = KA_APPLET(application);
     KA_DEBUG ("Evaluating command line");
-    
+
     if (!self->priv->startup_ccache &&
         self->priv->auto_run)
         ka_applet_destroy (self);
@@ -160,7 +163,7 @@ ka_applet_local_command_line (GApplication *application,
     };
 
     KA_DEBUG ("Parsing local command line");
-    
+
     context = g_option_context_new ("- Kerberos 5 credential checking");
     g_option_context_add_main_entries (context, options, NULL);
     g_option_context_add_group (context, gtk_get_option_group (TRUE));
@@ -179,18 +182,102 @@ ka_applet_local_command_line (GApplication *application,
     return FALSE;
 }
 
+GtkWindow *ka_applet_last_focused_window (KaApplet *self)
+{
+    GList *l = gtk_application_get_windows (GTK_APPLICATION(self));
+
+    if (l != NULL )
+        return g_list_first (l)->data;
+
+    return NULL;
+}
+
+static void
+action_preferences (GSimpleAction *action G_GNUC_UNUSED,
+		    GVariant *parameter G_GNUC_UNUSED,
+		    gpointer userdata)
+{
+    KaApplet *self = userdata;
+
+    ka_preferences_window_show (self);
+}
+
+static void
+action_about (GSimpleAction *action G_GNUC_UNUSED,
+              GVariant *parameter G_GNUC_UNUSED,
+              gpointer userdata)
+{
+    KaApplet *self = KA_APPLET(userdata);
+
+    ka_show_about (self);
+}
+
+static void
+action_help (GSimpleAction *action G_GNUC_UNUSED,
+              GVariant *parameter G_GNUC_UNUSED,
+              gpointer userdata)
+{
+    KaApplet *self = KA_APPLET(userdata);
+    GtkWindow *window = ka_applet_last_focused_window (self);
+
+    ka_show_help (gtk_window_get_screen (window), NULL, NULL);
+}
+
+static void
+action_quit (GSimpleAction *action G_GNUC_UNUSED,
+             GVariant *parameter G_GNUC_UNUSED,
+             gpointer userdata)
+{
+    KaApplet *self = KA_APPLET (userdata);
+
+    ka_applet_destroy (self);
+}
+
+static GActionEntry app_entries[] = {
+    { "preferences", action_preferences, NULL, NULL, NULL, {0} },
+    { "about", action_about, NULL, NULL, NULL, {0} },
+    { "help", action_help, NULL, NULL, NULL, {0} },
+    { "quit", action_quit, NULL, NULL, NULL, {0} },
+};
+
+static void
+ka_applet_app_menu_create(KaApplet *self,
+                          GtkBuilder *uixml)
+{
+    const gchar *debug_no_app_menu;
+    GMenuModel *model = G_MENU_MODEL(gtk_builder_get_object (uixml,
+                                                             "app-menu"));
+    g_action_map_add_action_entries (G_ACTION_MAP (self),
+                                     app_entries, G_N_ELEMENTS (app_entries),
+                                     self);
+
+    g_assert (model != NULL);
+    gtk_application_set_app_menu (GTK_APPLICATION(self),
+                                  model);
+
+    debug_no_app_menu = g_getenv ("KRB5_AUTH_DIALOG_DEBUG_NO_APP_MENU");
+    if (debug_no_app_menu) {
+        KA_DEBUG ("Disabling app menu GtkSetting as requested...");
+        g_object_set (gtk_settings_get_default (),
+                      "gtk-shell-shows-app-menu", FALSE,
+                      NULL);
+    }
+}
+
 static void
 ka_applet_startup (GApplication *application)
 {
     KaApplet *self = KA_APPLET (application);
-    GtkWindow *main_window;
 
     KA_DEBUG ("Primary application");
 
+    G_APPLICATION_CLASS (ka_applet_parent_class)->startup (application);
+
     self->priv->startup_ccache = ka_kerberos_init (self);
-    main_window = ka_main_window_create (self, self->priv->uixml);
-    gtk_application_add_window (GTK_APPLICATION(self), main_window);
+    ka_main_window_create (self, self->priv->uixml);
     ka_preferences_window_create (self, self->priv->uixml);
+
+    ka_applet_app_menu_create(self, self->priv->uixml);
 }
 
 static void
@@ -243,6 +330,12 @@ ka_applet_set_property (GObject *object,
                   self->priv->tgt_renewable ? "True" : "False");
         break;
 
+    case KA_PROP_CONF_TICKETS:
+        self->priv->conf_tickets = g_value_get_boolean (value);
+        KA_DEBUG ("%s: %s", pspec->name,
+                  self->priv->tgt_renewable ? "True" : "False");
+        break;
+
     default:
         /* We don't have any other property... */
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -287,6 +380,10 @@ ka_applet_get_property (GObject *object,
         g_value_set_boolean (value, self->priv->tgt_renewable);
         break;
 
+    case KA_PROP_CONF_TICKETS:
+        g_value_set_boolean (value, self->priv->conf_tickets);
+        break;
+
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -367,25 +464,25 @@ ka_applet_class_init (KaAppletClass *klass)
     object_class->set_property = ka_applet_set_property;
     object_class->get_property = ka_applet_get_property;
 
-    pspec = g_param_spec_string ("principal",
+    pspec = g_param_spec_string (KA_PROP_NAME_PRINCIPAL,
                                  "Principal",
                                  "Get/Set Kerberos principal",
                                  "", G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
     g_object_class_install_property (object_class, KA_PROP_PRINCIPAL, pspec);
 
-    pspec = g_param_spec_string ("pk-userid",
+    pspec = g_param_spec_string (KA_PROP_NAME_PK_USERID,
                                  "PKinit identifier",
                                  "Get/Set Pkinit identifier",
                                  "", G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
     g_object_class_install_property (object_class, KA_PROP_PK_USERID, pspec);
 
-    pspec = g_param_spec_string ("pk-anchors",
+    pspec = g_param_spec_string (KA_PROP_NAME_PK_ANCHORS,
                                  "PKinit trust anchors",
                                  "Get/Set Pkinit trust anchors",
                                  "", G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
     g_object_class_install_property (object_class, KA_PROP_PK_ANCHORS, pspec);
 
-    pspec = g_param_spec_uint ("pw-prompt-mins",
+    pspec = g_param_spec_uint (KA_PROP_NAME_PW_PROMPT_MINS,
                                "Password prompting interval",
                                "Password prompting interval in minutes",
                                0, G_MAXUINT, MINUTES_BEFORE_PROMPTING,
@@ -393,7 +490,7 @@ ka_applet_class_init (KaAppletClass *klass)
     g_object_class_install_property (object_class,
                                      KA_PROP_PW_PROMPT_MINS, pspec);
 
-    pspec = g_param_spec_boolean ("tgt-forwardable",
+    pspec = g_param_spec_boolean (KA_PROP_NAME_TGT_FORWARDABLE,
                                   "Forwardable ticket",
                                   "wether to request forwardable tickets",
                                   FALSE,
@@ -401,7 +498,7 @@ ka_applet_class_init (KaAppletClass *klass)
     g_object_class_install_property (object_class,
                                      KA_PROP_TGT_FORWARDABLE, pspec);
 
-    pspec = g_param_spec_boolean ("tgt-proxiable",
+    pspec = g_param_spec_boolean (KA_PROP_NAME_TGT_PROXIABLE,
                                   "Proxiable ticket",
                                   "wether to request proxiable tickets",
                                   FALSE,
@@ -409,13 +506,22 @@ ka_applet_class_init (KaAppletClass *klass)
     g_object_class_install_property (object_class,
                                      KA_PROP_TGT_PROXIABLE, pspec);
 
-    pspec = g_param_spec_boolean ("tgt-renewable",
+    pspec = g_param_spec_boolean (KA_PROP_NAME_TGT_RENEWABLE,
                                   "Renewable ticket",
                                   "wether to request renewable tickets",
                                   FALSE,
                                   G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
     g_object_class_install_property (object_class,
                                      KA_PROP_TGT_RENEWABLE, pspec);
+
+    pspec = g_param_spec_boolean (KA_PROP_NAME_CONF_TICKETS,
+                                  "Configuration tickets",
+                                  "wether to show configuration tickets",
+                                  FALSE,
+                                  G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
+    g_object_class_install_property (object_class,
+                                     KA_PROP_CONF_TICKETS, pspec);
+
     for (i=0; i < KA_SIGNAL_COUNT-1; i++) {
         guint signalId;
 
@@ -427,7 +533,7 @@ ka_applet_class_init (KaAppletClass *klass)
         klass->signals[i] = signalId;
     }
     klass->signals[KA_CCACHE_CHANGED] = g_signal_new (
-        ka_signal_names[KA_CCACHE_CHANGED], 
+        ka_signal_names[KA_CCACHE_CHANGED],
         G_OBJECT_CLASS_TYPE (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
         g_cclosure_marshal_VOID__VOID,
@@ -438,7 +544,7 @@ ka_applet_class_init (KaAppletClass *klass)
 static KaApplet *
 ka_applet_new (void)
 {
-    return g_object_new (KA_TYPE_APPLET, 
+    return g_object_new (KA_TYPE_APPLET,
                          "application-id", "org.gnome.KrbAuthDialog",
                          NULL);
 }
@@ -532,15 +638,20 @@ ka_notify_disable_action_cb (NotifyNotification *notification G_GNUC_UNUSED,
                               gpointer user_data)
 {
     KaApplet *self = KA_APPLET (user_data);
+    GSettings *ns = g_settings_get_child (self->priv->settings,
+                                              KA_SETTING_CHILD_NOTIFY);
 
     if (strcmp (action, "dont-show-again") == 0) {
-        KA_DEBUG ("turning of notification %s", self->priv->notify_gconf_key);
-        ka_gconf_set_bool (self->priv->gconf,
-                           self->priv->notify_gconf_key, FALSE);
-        self->priv->notify_gconf_key = NULL;
+        KA_DEBUG ("turning of notification %s", self->priv->notify_key);
+        if (!g_settings_set_boolean (ns,
+                                     self->priv->notify_key, FALSE)) {
+            g_warning("Failed to set %s", self->priv->notify_key);
+        }
+        self->priv->notify_key = NULL;
     } else {
         g_warning ("unkonwn action for callback");
     }
+    g_object_unref (ns);
 }
 
 
@@ -562,7 +673,7 @@ ka_notify_ticket_action_cb (NotifyNotification *notification G_GNUC_UNUSED,
         ka_destroy_ccache (self);
     } else if (strcmp (action, "ka-list-tickets") == 0) {
         KA_DEBUG ("Showing main window");
-        ka_main_window_show ();
+        ka_main_window_show (self);
     } else {
         g_warning ("unkonwn action for callback");
     }
@@ -621,6 +732,12 @@ ka_send_event_notification (KaApplet *self,
         notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
     }
 
+#if HAVE_NOTIFY_NOTIFICATION_SET_HINT
+    notify_notification_set_hint (notification,
+                                  "desktop-entry",
+                                  g_variant_new_string (PACKAGE));
+#endif
+
     if (self->priv->ns_persistence) {
         hint = "resident";
         timeout = NOTIFY_EXPIRES_NEVER;
@@ -685,6 +802,18 @@ ka_update_tray_icon (KaApplet *self, const char *icon, const char *tooltip)
     }
 }
 
+/* check whether a given notification is enabled */
+static gboolean
+get_notify_enabled (KaApplet *self, const char *key)
+{
+    gboolean ret;
+    GSettings *ns = g_settings_get_child (self->priv->settings,
+                                          KA_SETTING_CHILD_NOTIFY);
+    ret = g_settings_get_boolean (ns, key);
+    g_object_unref (ns);
+    return ret;
+}
+
 /*
  * update the tray icon's tooltip and icon
  * and notify listeners about acquired/expiring tickets via signals
@@ -705,10 +834,9 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
     if (remaining > 0) {
         if (expiry_notified || initial_notification) {
             const char* msg;
-            ka_gconf_get_bool (applet->priv->gconf,
-                               KA_GCONF_KEY_NOTIFY_VALID, &notify);
+            notify = get_notify_enabled (applet, KA_SETTING_KEY_NOTIFY_VALID);
             if (notify) {
-                applet->priv->notify_gconf_key = KA_GCONF_KEY_NOTIFY_VALID;
+                applet->priv->notify_key = KA_SETTING_KEY_NOTIFY_VALID;
 
                 if (applet->priv->krb_msg)
                     msg = applet->priv->krb_msg;
@@ -732,11 +860,11 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
             if (remaining < applet->priv->pw_prompt_secs
                 && (now - last_warn) > NOTIFY_SECONDS
                 && !applet->priv->renewable) {
-                ka_gconf_get_bool (applet->priv->gconf,
-                                   KA_GCONF_KEY_NOTIFY_EXPIRING, &notify);
+                notify = get_notify_enabled (applet,
+                                             KA_SETTING_KEY_NOTIFY_EXPIRING);
                 if (notify) {
-                    applet->priv->notify_gconf_key =
-                        KA_GCONF_KEY_NOTIFY_EXPIRING;
+                    applet->priv->notify_key =
+                        KA_SETTING_KEY_NOTIFY_EXPIRING;
                     ka_send_event_notification (applet,
                                                 _("Network credentials expiring"),
                                                 tooltip_text,
@@ -751,13 +879,12 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
         }
     } else {
         if (!expiry_notified) {
-            ka_gconf_get_bool (applet->priv->gconf,
-                               KA_GCONF_KEY_NOTIFY_EXPIRED, &notify);
+            notify = get_notify_enabled (applet, KA_SETTING_KEY_NOTIFY_EXPIRED);
             if (notify) {
-                applet->priv->notify_gconf_key = KA_GCONF_KEY_NOTIFY_EXPIRED;
+                applet->priv->notify_key = KA_SETTING_KEY_NOTIFY_EXPIRED;
                 ka_send_event_notification (applet,
                                             _("Network credentials expired"),
-                                            _("Your Kerberos credentails have expired."),
+                                            _("Your Kerberos credentials have expired."),
                                             "krb-no-valid-ticket",
                                             TRUE);
             }
@@ -776,7 +903,7 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
 
 
 static void
-ka_applet_menu_add_separator_item (GtkWidget *menu)
+ka_applet_tray_icon_menu_add_separator_item (GtkWidget *menu)
 {
     GtkWidget *menu_item;
 
@@ -788,7 +915,8 @@ ka_applet_menu_add_separator_item (GtkWidget *menu)
 
 /* Free all resources and quit */
 static void
-ka_applet_quit_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data)
+ka_applet_tray_icon_quit_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                             gpointer user_data)
 {
     KaApplet *applet = KA_APPLET (user_data);
 
@@ -797,8 +925,8 @@ ka_applet_quit_cb (GtkMenuItem *menuitem G_GNUC_UNUSED, gpointer user_data)
 
 
 static void
-ka_applet_show_help_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                        gpointer user_data)
+ka_applet_tray_icon_show_help_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                                  gpointer user_data)
 {
     KaApplet *applet = KA_APPLET (user_data);
 
@@ -808,8 +936,8 @@ ka_applet_show_help_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
 
 
 static void
-ka_applet_destroy_ccache_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                             gpointer user_data)
+ka_applet_tray_icon_destroy_ccache_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                                       gpointer user_data)
 {
     KaApplet *applet = KA_APPLET (user_data);
 
@@ -817,10 +945,10 @@ ka_applet_destroy_ccache_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
 }
 
 static void
-ka_applet_show_tickets_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                           gpointer user_data G_GNUC_UNUSED)
+ka_applet_tray_icon_show_tickets_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
+                                     gpointer user_data)
 {
-    ka_main_window_show ();
+    ka_main_window_show (KA_APPLET(user_data));
 }
 
 
@@ -838,31 +966,32 @@ ka_applet_create_context_menu (KaApplet *applet)
     menu_item =
         gtk_image_menu_item_new_with_mnemonic (_("Remove Credentials _Cache"));
     g_signal_connect (G_OBJECT (menu_item), "activate",
-                      G_CALLBACK (ka_applet_destroy_ccache_cb), applet);
+                      G_CALLBACK (ka_applet_tray_icon_destroy_ccache_cb),
+                      applet);
     image = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU);
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
-    ka_applet_menu_add_separator_item (menu);
+    ka_applet_tray_icon_menu_add_separator_item (menu);
 
     /* Ticket dialog */
     menu_item = gtk_image_menu_item_new_with_mnemonic (_("_List Tickets"));
     g_signal_connect (G_OBJECT (menu_item), "activate",
-                      G_CALLBACK (ka_applet_show_tickets_cb), applet);
+                      G_CALLBACK (ka_applet_tray_icon_show_tickets_cb), applet);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
     /* Help item */
     menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_HELP, NULL);
     g_signal_connect (G_OBJECT (menu_item), "activate",
-                      G_CALLBACK (ka_applet_show_help_cb), applet);
+                      G_CALLBACK (ka_applet_tray_icon_show_help_cb), applet);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
-    ka_applet_menu_add_separator_item (menu);
+    ka_applet_tray_icon_menu_add_separator_item (menu);
 
     /* Quit */
     menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL);
     g_signal_connect (G_OBJECT (menu_item), "activate",
-                      G_CALLBACK (ka_applet_quit_cb), applet);
+                      G_CALLBACK (ka_applet_tray_icon_quit_cb), applet);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
     gtk_widget_show_all (menu);
@@ -957,10 +1086,10 @@ ka_applet_get_pwdialog (const KaApplet *applet)
     return applet->priv->pwdialog;
 }
 
-GConfClient *
-ka_applet_get_gconf_client (const KaApplet *self)
+GSettings *
+ka_applet_get_settings (const KaApplet *self)
 {
-    return self->priv->gconf;
+    return self->priv->settings;
 }
 
 void
@@ -1030,11 +1159,12 @@ ka_applet_destroy (KaApplet* self)
     windows = gtk_application_get_windows (GTK_APPLICATION(self));
     if (windows) {
         first = g_list_first (windows);
-        gtk_application_remove_window(GTK_APPLICATION (self), 
+        gtk_application_remove_window(GTK_APPLICATION (self),
                                       GTK_WINDOW (first->data));
     }
 
     ka_kerberos_destroy ();
+    ka_preferences_window_destroy ();
 }
 
 
@@ -1070,8 +1200,8 @@ ka_applet_create ()
     applet->priv->pwdialog = ka_pwdialog_create (applet->priv->uixml);
     g_return_val_if_fail (applet->priv->pwdialog != NULL, NULL);
 
-    applet->priv->gconf = ka_gconf_init (applet);
-    g_return_val_if_fail (applet->priv->gconf != NULL, NULL);
+    applet->priv->settings = ka_settings_init (applet);
+    g_return_val_if_fail (applet->priv->settings != NULL, NULL);
 
     applet->priv->loader = ka_plugin_loader_create (applet);
     g_return_val_if_fail (applet->priv->loader != NULL, NULL);
diff --git a/src/ka-gconf-tools.c b/src/ka-gconf-tools.c
deleted file mode 100644
index c7cc711..0000000
--- a/src/ka-gconf-tools.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Krb5 Auth Applet -- Acquire and release kerberos tickets
- *
- * (C) 2008,2009 Guido Guenther <agx@sigxcpu.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-#include "config.h"
-
-#include <gconf/gconf-client.h>
-#include <ka-gconf-tools.h>
-
-gboolean
-ka_gconf_get_string (GConfClient* client,
-		     const char* key,
-		     char** value)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-	GConfValue*	gc_value;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (*value == NULL, FALSE);
-
-	if ((gc_value = gconf_client_get (client, key, &error))) {
-		if (gc_value->type == GCONF_VALUE_STRING) {
-			*value = g_strdup (gconf_value_get_string (gc_value));
-			success = TRUE;
-		} else if (error) {
-				g_warning ("%s", error->message);
-				g_clear_error (&error);
-		}
-		gconf_value_free (gc_value);
-	}
-	return success;
-}
-
-
-gboolean
-ka_gconf_get_string_list (GConfClient* client,
-		          const char* key,
-		          GSList** list)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (*list == NULL, FALSE);
-
-	if ((*list = gconf_client_get_list (client, key,
-	                                   GCONF_VALUE_STRING, &error))) {
-		if (error) {
-			g_warning ("%s", error->message);
-			g_clear_error (&error);
-		} else
-			success = TRUE;
-	}
-	return success;
-}
-
-
-gboolean
-ka_gconf_get_int (GConfClient* client,
-		    const char* key,
-		    int* value)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-	GConfValue*	gc_value;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (value != NULL, FALSE);
-
-	if ((gc_value = gconf_client_get (client, key, &error)))
-	{
-		if (gc_value->type == GCONF_VALUE_INT) {
-			*value = gconf_value_get_int (gc_value);
-			success = TRUE;
-		} else if (error) {
-				g_warning("%s", error->message);
-				g_clear_error (&error);
-		}
-		gconf_value_free (gc_value);
-	}
-	return success;
-}
-
-
-gboolean
-ka_gconf_get_bool (GConfClient* client,
-		    const char* key,
-		    gboolean* value)
-{
-	GError*		error = NULL;
-	gboolean	success = FALSE;
-	GConfValue*	gc_value;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-	g_return_val_if_fail (value != NULL, FALSE);
-
-	if ((gc_value = gconf_client_get (client, key, &error))) {
-		if (gc_value->type == GCONF_VALUE_BOOL) {
-			*value = gconf_value_get_bool (gc_value);
-			success = TRUE;
-		} else if (error) {
-				g_warning ("%s", error->message);
-				g_clear_error (&error);
-		}
-		gconf_value_free (gc_value);
-	}
-	return success;
-}
-
-
-gboolean
-ka_gconf_set_bool (GConfClient* client,
-		    const char* key,
-		    gboolean value)
-{
-	GError*		error = NULL;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
-
-	if(!gconf_client_set_bool (client, key, value, &error)) {
-		if (error) {
-			g_warning ("%s", error->message);
-			g_clear_error (&error);
-		}
-		return FALSE;
-	}
-	return TRUE;
-}
diff --git a/src/ka-gconf-tools.h b/src/ka-gconf-tools.h
deleted file mode 100644
index 1d8151d..0000000
--- a/src/ka-gconf-tools.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Krb5 Auth Applet -- Acquire and release kerberos tickets
- *
- * (C) 2008,2009 Guido Guenther <agx@sigxcpu.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef KA_GCONF_TOOLS_H
-#define KA_GCONF_TOOLS_H
-
-#include "config.h"
-
-#include <gconf/gconf-client.h>
-
-#define KA_GCONF_PATH			"/apps/" PACKAGE
-#define KA_GCONF_KEY_PRINCIPAL		KA_GCONF_PATH "/principal"
-#define KA_GCONF_KEY_PK_USERID		KA_GCONF_PATH "/pk_userid"
-#define KA_GCONF_KEY_PK_ANCHORS		KA_GCONF_PATH "/pk_anchors"
-#define KA_GCONF_KEY_PROMPT_MINS	KA_GCONF_PATH "/prompt_minutes"
-#define KA_GCONF_KEY_SHOW_TRAYICON	KA_GCONF_PATH "/show_trayicon"
-#define KA_GCONF_KEY_FORWARDABLE	KA_GCONF_PATH "/forwardable"
-#define KA_GCONF_KEY_RENEWABLE		KA_GCONF_PATH "/renewable"
-#define KA_GCONF_KEY_PROXIABLE		KA_GCONF_PATH "/proxiable"
-#define KA_GCONF_KEY_NOTIFY_VALID	KA_GCONF_PATH "/notify/valid"
-#define KA_GCONF_KEY_NOTIFY_EXPIRED	KA_GCONF_PATH "/notify/expired"
-#define KA_GCONF_KEY_NOTIFY_EXPIRING	KA_GCONF_PATH "/notify/expiring"
-#define KA_GCONF_KEY_PLUGINS_ENABLED	KA_GCONF_PATH "/plugins/enabled"
-
-gboolean ka_gconf_get_string (GConfClient* client, const char* key, char** value);
-gboolean ka_gconf_get_string_list (GConfClient* client, const char* key, GSList** list);
-gboolean ka_gconf_get_int (GConfClient* client, const char* key, int* value);
-gboolean ka_gconf_get_bool (GConfClient* client, const char* key, gboolean* value);
-gboolean ka_gconf_set_bool (GConfClient* client, const char* key, gboolean value);
-
-#endif
diff --git a/src/ka-gconf.c b/src/ka-gconf.c
deleted file mode 100644
index 0735808..0000000
--- a/src/ka-gconf.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Krb5 Auth Applet -- Acquire and release kerberos tickets
- *
- * (C) 2008,2009 Guido Guenther <agx@sigxcpu.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-#include "config.h"
-
-#include <gconf/gconf-client.h>
-#include <string.h>
-
-#include "ka-applet-priv.h"
-#include "ka-gconf-tools.h"
-#include "ka-gconf.h"
-
-static gboolean
-ka_gconf_set_principal (GConfClient* client, KaApplet* applet)
-{
-	gchar* principal = NULL;
-
-	if(!ka_gconf_get_string (client, KA_GCONF_KEY_PRINCIPAL, &principal)
-	   || !strlen(principal)) {
-		g_free (principal);
-		principal = g_strdup (g_get_user_name());
-	}
-	g_object_set(applet, "principal", principal, NULL);
-	g_free (principal);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_pk_userid (GConfClient* client, KaApplet* applet)
-{
-	gchar*  pk_userid = NULL;
-
-	if(!ka_gconf_get_string (client, KA_GCONF_KEY_PK_USERID, &pk_userid)) {
-		pk_userid = g_strdup ("");
-	}
-	g_object_set(applet, "pk_userid", pk_userid, NULL);
-	g_free (pk_userid);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_pk_anchors (GConfClient* client, KaApplet* applet)
-{
-	gchar*  pk_anchors = NULL;
-
-	if(!ka_gconf_get_string (client, KA_GCONF_KEY_PK_ANCHORS, &pk_anchors)) {
-		pk_anchors = g_strdup ("");
-	}
-	g_object_set(applet, "pk_anchors", pk_anchors, NULL);
-	g_free (pk_anchors);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_prompt_mins (GConfClient* client, KaApplet* applet)
-{
-	gint prompt_mins = 0;
-
-	if(!ka_gconf_get_int (client, KA_GCONF_KEY_PROMPT_MINS, &prompt_mins)) {
-		prompt_mins = MINUTES_BEFORE_PROMPTING;
-	}
-	g_object_set(applet, "pw-prompt-mins", prompt_mins, NULL);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_tgt_forwardable (GConfClient* client, KaApplet* applet)
-{
-	gboolean forwardable = FALSE;
-
-	if(!ka_gconf_get_bool(client, KA_GCONF_KEY_FORWARDABLE, &forwardable)) {
-		forwardable = FALSE;
-	}
-	g_object_set(applet, "tgt-forwardable", forwardable, NULL);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_tgt_renewable (GConfClient* client, KaApplet* applet)
-{
-	gboolean renewable = FALSE;
-
-	if(!ka_gconf_get_bool(client, KA_GCONF_KEY_RENEWABLE, &renewable)) {
-		renewable = FALSE;
-	}
-	g_object_set(applet, "tgt-renewable", renewable, NULL);
-	return TRUE;
-}
-
-
-static gboolean
-ka_gconf_set_tgt_proxiable (GConfClient* client, KaApplet* applet)
-{
-	gboolean proxiable = FALSE;
-
-	if(!ka_gconf_get_bool(client, KA_GCONF_KEY_PROXIABLE, &proxiable)) {
-		proxiable = FALSE;
-	}
-	g_object_set(applet, "tgt-proxiable", proxiable, NULL);
-	return TRUE;
-}
-
-
-static void
-ka_gconf_key_changed_callback (GConfClient* client,
-                               guint cnxn_id G_GNUC_UNUSED,
-                               GConfEntry* entry,
-                               gpointer user_data)
-{
-	const char* key;
-
-	KaApplet* applet = KA_APPLET(user_data);
-	key = gconf_entry_get_key (entry);
-	if (!key)
-		return;
-	KA_DEBUG("Key %s changed", key);
-
-	if (g_strcmp0 (key, KA_GCONF_KEY_PRINCIPAL) == 0) {
-		ka_gconf_set_principal (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_PROMPT_MINS) == 0) {
-		ka_gconf_set_prompt_mins (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_PK_USERID) == 0) {
-		ka_gconf_set_pk_userid (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_PK_ANCHORS) == 0) {
-		ka_gconf_set_pk_anchors(client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_FORWARDABLE) == 0) {
-		ka_gconf_set_tgt_forwardable (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_RENEWABLE) == 0) {
-		ka_gconf_set_tgt_renewable (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_PROXIABLE) == 0) {
-		ka_gconf_set_tgt_proxiable (client, applet);
-	} else if (g_strcmp0 (key, KA_GCONF_KEY_NOTIFY_VALID)
-		    || g_strcmp0 (key, KA_GCONF_KEY_NOTIFY_EXPIRING)
-		    || g_strcmp0 (key, KA_GCONF_KEY_NOTIFY_EXPIRED)
-		    || g_strcmp0 (key, KA_GCONF_KEY_PLUGINS_ENABLED)) {
-		/* nothing to do */
-	} else
-		g_warning("Received notification for unknown gconf key %s", key);
-	return;
-}
-
-
-GConfClient*
-ka_gconf_init (KaApplet* applet)
-{
-	GError *error = NULL;
-	GConfClient *client;
-
-	client = gconf_client_get_default ();
-	gconf_client_add_dir (client, KA_GCONF_PATH, GCONF_CLIENT_PRELOAD_ONELEVEL, &error);
-	if (error)
-		goto out;
-
-	gconf_client_notify_add (client, KA_GCONF_PATH,
-				 ka_gconf_key_changed_callback, applet, NULL, &error);
-	if (error)
-		goto out;
-
-	/* setup defaults */
-	ka_gconf_set_principal (client, applet);
-	ka_gconf_set_prompt_mins (client, applet);
-	ka_gconf_set_pk_userid(client, applet);
-	ka_gconf_set_pk_anchors(client, applet);
-	ka_gconf_set_tgt_forwardable(client, applet);
-	ka_gconf_set_tgt_renewable(client, applet);
-	ka_gconf_set_tgt_proxiable(client, applet);
-out:
-	if (error) {
-		client = NULL;
-		g_warning ("%s", error->message);
-		g_clear_error (&error);
-	}
-	return client;
-}
diff --git a/src/ka-kerberos.c b/src/ka-kerberos.c
index e131286..db5cddd 100644
--- a/src/ka-kerberos.c
+++ b/src/ka-kerberos.c
@@ -287,7 +287,7 @@ ka_format_time (time_t t, gchar *ts, size_t len)
 
 /* fill in service tickets data */
 gboolean
-ka_get_service_tickets (GtkListStore * tickets)
+ka_get_service_tickets (GtkListStore * tickets, gboolean hide_conf_tickets)
 {
     krb5_cc_cursor cursor;
     krb5_creds creds;
@@ -325,6 +325,13 @@ ka_get_service_tickets (GtkListStore * tickets)
     while ((ret = krb5_cc_next_cred (kcontext, ccache, &cursor, &creds)) == 0) {
         gboolean renewable, proxiable, forwardable;
 
+
+        if (hide_conf_tickets && krb5_is_config_principal (kcontext,
+                                                           creds.server)) {
+            krb5_free_cred_contents (kcontext, &creds);
+            continue;
+        }
+
         if (creds.times.starttime)
             ka_format_time (creds.times.starttime, start_time,
                             sizeof (start_time));
@@ -531,7 +538,7 @@ credentials_expiring_once (gpointer *data)
 
 
 /*
- * set ticket options by looking at krb5.conf and gconf
+ * set ticket options by looking at krb5.conf and gsettings
  */
 static void
 ka_set_ticket_options (KaApplet *applet, krb5_context context,
@@ -546,13 +553,13 @@ ka_set_ticket_options (KaApplet *applet, krb5_context context,
                                                krb5_principal_get_realm
                                                (context, kprincipal), out);
 #endif
-    g_object_get (applet, "tgt-forwardable", &flag, NULL);
+    g_object_get (applet, KA_PROP_NAME_TGT_FORWARDABLE, &flag, NULL);
     if (flag)
         krb5_get_init_creds_opt_set_forwardable (out, flag);
-    g_object_get (applet, "tgt-proxiable", &flag, NULL);
+    g_object_get (applet, KA_PROP_NAME_TGT_PROXIABLE, &flag, NULL);
     if (flag)
         krb5_get_init_creds_opt_set_proxiable (out, flag);
-    g_object_get (applet, "tgt-renewable", &flag, NULL);
+    g_object_get (applet, KA_PROP_NAME_TGT_RENEWABLE, &flag, NULL);
     if (flag) {
         krb5_deltat r = 3600 * 24 * 30; /* 1 month */
 
@@ -640,7 +647,7 @@ ka_parse_name (KaApplet *applet, krb5_context krbcontext,
     if (*kprinc != NULL)
         krb5_free_principal (krbcontext, *kprinc);
 
-    g_object_get (applet, "principal", &principal, NULL);
+    g_object_get (applet, KA_PROP_NAME_PRINCIPAL, &principal, NULL);
     ret = krb5_parse_name (krbcontext, principal, kprinc);
 
     g_free (principal);
@@ -752,7 +759,7 @@ grab_credentials (KaApplet *applet)
     if (retval)
         goto out2;
 
-    g_object_get (applet, "pk-userid", &pk_userid,
+    g_object_get (applet, KA_PROP_NAME_PK_USERID, &pk_userid,
                   "pk-anchors", &pk_anchors, NULL);
 #if ENABLE_PKINIT && HAVE_HX509_ERR_H && HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PKINIT
     /* pk_userid set: try pkinit */
@@ -960,7 +967,7 @@ ka_check_credentials (KaApplet *applet, const char *newprincipal)
     int retval;
     char *principal;
 
-    g_object_get (applet, "principal", &principal, NULL);
+    g_object_get (applet, KA_PROP_NAME_PRINCIPAL, &principal, NULL);
 
     if (strlen (newprincipal)) {
         krb5_principal knewprinc;
diff --git a/src/ka-kerberos.h b/src/ka-kerberos.h
index 504cc14..aa70c90 100644
--- a/src/ka-kerberos.h
+++ b/src/ka-kerberos.h
@@ -29,7 +29,8 @@ gboolean ka_kerberos_destroy (void);
 gboolean ka_destroy_ccache (KaApplet* applet);
 gboolean ka_grab_credentials(KaApplet* applet);
 gboolean ka_check_credentials (KaApplet *applet, const char* principal);
-gboolean ka_get_service_tickets(GtkListStore *tickets);
+gboolean ka_get_service_tickets(GtkListStore *tickets,
+                                gboolean hide_service_tickets);
 char* ka_unparse_name(void);
 int ka_tgt_valid_seconds(void);
 #endif
diff --git a/src/ka-main-window.c b/src/ka-main-window.c
index b841b3e..efcec63 100644
--- a/src/ka-main-window.c
+++ b/src/ka-main-window.c
@@ -2,7 +2,7 @@
  *
  * Krb5 Auth Applet -- Acquire and release kerberos tickets
  *
- * (C) 2009,2011 Guido Guenther <agx@sigxcpu.org>
+ * (C) 2009,2011,2013 Guido Guenther <agx@sigxcpu.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,68 +31,21 @@
 #include "ka-preferences.h"
 
 static GtkListStore *tickets;
-static GtkWindow *main_window;
+static GtkApplicationWindow *main_window;
 
 static void
-ccache_changed_cb (KaApplet* applet G_GNUC_UNUSED,
+ccache_changed_cb (KaApplet* applet,
                    gpointer user_data G_GNUC_UNUSED)
 {
-    KA_DEBUG("Refreshing ticket list");
-    ka_get_service_tickets (tickets);
-}
-
-static void
-menuitem_close_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                   gpointer user_data G_GNUC_UNUSED)
-{
-    ka_main_window_hide();
-}
+    gboolean conf_tickets;
 
-static void
-menuitem_preferences_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                         gpointer user_data G_GNUC_UNUSED)
-{
-    ka_preferences_window_show (main_window);
-}
-
-static void
-menuitem_about_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                   gpointer user_data G_GNUC_UNUSED)
-{
-    ka_show_about ();
-}
-
-static void
-menuitem_help_contents_cb (GtkMenuItem *menuitem G_GNUC_UNUSED,
-                   gpointer user_data G_GNUC_UNUSED)
-{
-    ka_show_help (gtk_window_get_screen (main_window), NULL, NULL);
-}
-
-
-static void
-ka_main_window_create_menu (KaApplet *applet, GtkBuilder *xml)
-{
-    GtkMenuItem *item;
-
-#define CONNECT_MENU(name)                                              \
-    item = GTK_MENU_ITEM (gtk_builder_get_object (xml,                  \
-                                                  "menuitem_" #name));  \
-    g_signal_connect (item,                                             \
-                      "activate",                                       \
-                      G_CALLBACK(menuitem_ ##name## _cb),               \
-                      applet)
-
-    CONNECT_MENU(close);
-    CONNECT_MENU(preferences);
-    CONNECT_MENU(about);
-    CONNECT_MENU(help_contents);
-
-#undef CONNECT_MENU  
+    KA_DEBUG("Refreshing ticket list");
+    g_object_get(applet, KA_PROP_NAME_CONF_TICKETS, &conf_tickets, NULL);
+    ka_get_service_tickets (tickets, !conf_tickets);
 }
 
 
-GtkWindow *
+GtkApplicationWindow *
 ka_main_window_create (KaApplet *applet, GtkBuilder *xml)
 {
     GtkCellRenderer *text_renderer, *toggle_renderer;
@@ -106,7 +59,10 @@ ka_main_window_create (KaApplet *applet, GtkBuilder *xml)
                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 
     main_window =
-        GTK_WINDOW (gtk_builder_get_object (xml, "krb5_main_window"));
+        GTK_APPLICATION_WINDOW (gtk_builder_get_object (xml,
+                                                        "krb5_main_window"));
+    g_object_set(main_window, "application", applet, NULL);
+
     tickets_view =
         GTK_TREE_VIEW (gtk_builder_get_object (xml, "krb5_tickets_treeview"));
     gtk_tree_view_set_model (GTK_TREE_VIEW (tickets_view),
@@ -159,18 +115,20 @@ ka_main_window_create (KaApplet *applet, GtkBuilder *xml)
                       G_CALLBACK(ccache_changed_cb),
                       NULL);
 
-    ka_main_window_create_menu(applet, xml);
     return main_window;
 }
 
 void
-ka_main_window_show ()
+ka_main_window_show (KaApplet *applet)
 {
-    if (ka_get_service_tickets (tickets)) {
-        gtk_window_present (main_window);
+    gboolean conf_tickets;
+
+    g_object_get(applet, KA_PROP_NAME_CONF_TICKETS, &conf_tickets, NULL);
+    if (ka_get_service_tickets (tickets, !conf_tickets)) {
+        gtk_window_present (GTK_WINDOW(main_window));
     } else {
         GtkWidget *message_dialog;
-        
+
         message_dialog = gtk_message_dialog_new (NULL,
                                                  GTK_DIALOG_DESTROY_WITH_PARENT,
                                                  GTK_MESSAGE_ERROR,
@@ -178,7 +136,7 @@ ka_main_window_show ()
                                                  _
                                                  ("Error displaying service ticket information"));
         gtk_window_set_resizable (GTK_WINDOW (message_dialog), FALSE);
-        
+
         g_signal_connect (message_dialog, "response",
                           G_CALLBACK (gtk_widget_destroy), NULL);
         gtk_widget_show (message_dialog);
diff --git a/src/ka-main-window.h b/src/ka-main-window.h
index bc5b191..ee1ea46 100644
--- a/src/ka-main-window.h
+++ b/src/ka-main-window.h
@@ -34,8 +34,8 @@ enum ticket_columns {
 };
 
 
-GtkWindow *ka_main_window_create (KaApplet *applet, GtkBuilder *xml);
-void ka_main_window_show (void);
+GtkApplicationWindow *ka_main_window_create (KaApplet *applet, GtkBuilder *xml);
+void ka_main_window_show (KaApplet *applet);
 void ka_main_window_hide (void);
 
 
diff --git a/src/ka-plugin-loader.c b/src/ka-plugin-loader.c
index 2321215..e21a863 100644
--- a/src/ka-plugin-loader.c
+++ b/src/ka-plugin-loader.c
@@ -16,12 +16,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <gconf/gconf-client.h>
-
 #include "ka-plugin-loader.h"
 #include "ka-plugin.h"
+#include "ka-settings.h"
 #include "ka-applet-priv.h"
-#include "ka-gconf-tools.h"
 
 #include <gmodule.h>
 
@@ -98,29 +96,33 @@ load_plugins (KaPluginLoader *self)
 {
 	int i;
 	KaPluginLoaderPrivate *priv = GET_PRIVATE (self);
-	const char *pname;
-	GConfClient *gconf;
-	GSList *plugins = NULL;
+	GSettings *settings;
+	char **plugins = NULL;
 
 	if (!g_module_supported ()) {
 		g_warning ("GModules are not supported on your platform!");
 		return;
 	}
-	gconf = ka_applet_get_gconf_client (priv->applet);
+	settings = g_settings_get_child(ka_applet_get_settings (priv->applet),
+                                        KA_SETTING_CHILD_PLUGINS);
 
 	/* For now we only load the plugins on program startup */
-	ka_gconf_get_string_list(gconf, KA_GCONF_KEY_PLUGINS_ENABLED, &plugins);
+	plugins = g_settings_get_strv(settings,
+                                      KA_SETTING_KEY_PLUGINS_ENABLED);
+
 	if (!plugins) {
 		g_message ("No plugins to load");
-		return ;
+		return;
 	}
 
-	for (i=0; (pname = g_slist_nth_data (plugins, i)) != NULL; i++) {
+	for (i = 0; plugins[i]; i++) {
 		char *path;
 		char *fname;
 		KaPlugin *plugin;
 
-		fname = g_strdup_printf("libka-plugin-%s.%s", pname, G_MODULE_SUFFIX);
+		fname = g_strdup_printf("libka-plugin-%s.%s",
+                                        plugins[i],
+                                        G_MODULE_SUFFIX);
 		path = g_module_build_path (KA_PLUGINS_DIR, fname);
 
 		plugin = load_plugin (path);
@@ -131,7 +133,8 @@ load_plugins (KaPluginLoader *self)
 		g_free (fname);
 		g_free (path);
 	}
-	g_slist_free (plugins);
+	g_strfreev (plugins);
+	g_object_unref (settings);
 }
 
 
diff --git a/src/ka-preferences.c b/src/ka-preferences.c
index a80f6d9..987ef5c 100644
--- a/src/ka-preferences.c
+++ b/src/ka-preferences.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ka-preferences.h"
 
-#include "ka-gconf-tools.h"
+#include "ka-settings.h"
 #include "ka-tools.h"
 
 #include <glib/gi18n.h>
@@ -30,12 +30,12 @@
 #define PKINIT_SMARTCARD "PKCS11:" SC_PKCS11
 #define PKINIT_FILE "FILE:"
 
-#define N_LISTENERS 7
+#define N_BINDINGS 3
 
 struct _KaPreferencesPrivate {
     GtkBuilder *builder;
 
-    GConfClient *client;
+    GSettings *settings;
 
     GtkWidget *dialog;
     GtkWidget *notebook;
@@ -45,28 +45,21 @@ struct _KaPreferencesPrivate {
     GtkWidget *smartcard_toggle;
     GtkWidget *pkanchors_entry;
     GtkWidget *pkanchors_button;
-    GtkWidget *forwardable_toggle;
-    GtkWidget *proxiable_toggle;
-    GtkWidget *renewable_toggle;
     GtkWidget *prompt_mins_entry;
 
-    guint     listeners [N_LISTENERS];
-    int       n_listeners;
+    GBinding* bindings[N_BINDINGS];
+    int       n_bindings;
 } prefs;
 
 
 static void
-ka_preferences_principal_notify (GConfClient *client G_GNUC_UNUSED,
-                                 guint cnx_id G_GNUC_UNUSED,
-                                 GConfEntry *entry,
+ka_preferences_principal_notify (GSettings *settings,
+                                 gchar *key,
                                  gpointer userdata G_GNUC_UNUSED)
 {
     const char *principal;
 
-    if (!entry->value || entry->value->type != GCONF_VALUE_STRING)
-      return;
-
-    principal = gconf_value_get_string (entry->value);
+    principal = g_settings_get_string (settings, key);
 
     if (!principal || !strlen(principal))
         gtk_entry_set_text (GTK_ENTRY (prefs.principal_entry), "");
@@ -81,63 +74,48 @@ ka_preferences_principal_notify (GConfClient *client G_GNUC_UNUSED,
 
 static void
 ka_preferences_principal_changed (GtkEntry *entry,
-                                  gpointer userdata G_GNUC_UNUSED)
+                                  gpointer userdata)
 {
     const char *principal;
+    KaApplet *applet = KA_APPLET(userdata);
 
     principal = gtk_entry_get_text (entry);
 
-    if (!principal || !strlen(principal))
-        gconf_client_unset (prefs.client, KA_GCONF_KEY_PRINCIPAL, NULL);
+    if (principal || strlen(principal))
+        g_object_set (applet, KA_PROP_NAME_PRINCIPAL, principal, NULL);
     else
-        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PRINCIPAL, principal, NULL);
+        g_object_set (applet, KA_PROP_NAME_PRINCIPAL, "", NULL);
 }
 
 
 static void
-ka_preferences_setup_principal_entry ()
+ka_preferences_setup_principal_entry (KaApplet *applet)
 {
-    char     *principal = NULL;
+    char *principal = NULL;
 
     prefs.principal_entry = WID (prefs.builder, "principal_entry");
     g_assert (prefs.principal_entry != NULL);
 
-    if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PRINCIPAL, &principal))
+    g_object_get (applet, KA_PROP_NAME_PRINCIPAL, &principal, NULL);
+    if (!principal)
         g_warning ("Getting principal failed");
-
     if (principal && strlen(principal))
         gtk_entry_set_text (GTK_ENTRY (prefs.principal_entry), principal);
-    if (principal)
-        g_free (principal);
+    g_free (principal);
 
     g_signal_connect (prefs.principal_entry, "changed",
-                      G_CALLBACK (ka_preferences_principal_changed), NULL);
-
-    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PRINCIPAL, NULL)) {
-        gtk_widget_set_sensitive (prefs.principal_entry, FALSE);
-    }
-
-    prefs.listeners [prefs.n_listeners] =
-        gconf_client_notify_add (prefs.client,
-                                 KA_GCONF_KEY_PRINCIPAL,
-                                 (GConfClientNotifyFunc) ka_preferences_principal_notify,
-                                 NULL, NULL, NULL);
-    prefs.n_listeners++;
+                      G_CALLBACK (ka_preferences_principal_changed), applet);
 }
 
 
 static void
-ka_preferences_pkuserid_notify (GConfClient *client G_GNUC_UNUSED,
-                                guint cnx_id G_GNUC_UNUSED,
-                                GConfEntry *entry,
-                                gpointer *userdata G_GNUC_UNUSED)
+ka_preferences_pkuserid_notify (GSettings *settings,
+                                gchar *key,
+                                gpointer userdata G_GNUC_UNUSED)
 {
     const char *pkuserid;
 
-    if (!entry->value || entry->value->type != GCONF_VALUE_STRING)
-        return;
-
-    pkuserid = gconf_value_get_string (entry->value);
+    pkuserid = g_settings_get_string (settings, key);
 
     if (!pkuserid || !strlen(pkuserid))
         gtk_entry_set_text (GTK_ENTRY (prefs.pkuserid_entry), "");
@@ -153,62 +131,47 @@ ka_preferences_pkuserid_notify (GConfClient *client G_GNUC_UNUSED,
 
 static void
 ka_preferences_pkuserid_changed (GtkEntry *entry,
-                                 gpointer *user_data G_GNUC_UNUSED)
+                                 gpointer *userdata)
 {
     const char *pkuserid;
+    KaApplet *applet = KA_APPLET(userdata);
 
     pkuserid = gtk_entry_get_text (entry);
 
     if (!pkuserid || !strlen(pkuserid))
-        gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_USERID, NULL);
+        g_object_set (applet, KA_PROP_NAME_PK_USERID, "", NULL);
     else
-        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_USERID, pkuserid, NULL);
+        g_object_set (applet, KA_PROP_NAME_PK_USERID, pkuserid, NULL);
 }
 
-
 static void
-ka_preferences_setup_pkuserid_entry ()
+ka_preferences_setup_pkuserid_entry (KaApplet *applet)
 {
     char     *pkuserid = NULL;
 
     prefs.pkuserid_entry = WID(prefs.builder, "pkuserid_entry");
     g_assert (prefs.pkuserid_entry != NULL);
 
-    if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PK_USERID, &pkuserid))
+    g_object_get (applet, KA_PROP_NAME_PK_USERID, &pkuserid, NULL);
+    if (!pkuserid)
         g_warning ("Getting pkuserid failed");
-
     if (pkuserid && strlen(pkuserid))
         gtk_entry_set_text (GTK_ENTRY (prefs.pkuserid_entry), pkuserid);
     if (pkuserid)
         g_free (pkuserid);
 
     g_signal_connect (prefs.pkuserid_entry, "changed",
-                      G_CALLBACK (ka_preferences_pkuserid_changed), NULL);
-    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PK_USERID, NULL)) {
-        gtk_widget_set_sensitive (prefs.pkuserid_entry, FALSE);
-    }
-
-    prefs.listeners [prefs.n_listeners] =
-        gconf_client_notify_add (prefs.client,
-                                 KA_GCONF_KEY_PK_USERID,
-                                 (GConfClientNotifyFunc) ka_preferences_pkuserid_notify,
-                                 NULL, NULL, NULL);
-    prefs.n_listeners++;
+                      G_CALLBACK (ka_preferences_pkuserid_changed), applet);
 }
 
-
 static void
-ka_preferences_pkanchors_notify (GConfClient *client G_GNUC_UNUSED,
-                                 guint cnx_id G_GNUC_UNUSED,
-                                 GConfEntry *entry,
+ka_preferences_pkanchors_notify (GSettings *settings,
+                                 gchar *key,
                                  gpointer userdata G_GNUC_UNUSED)
 {
     const char *pkanchors;
 
-    if (!entry->value || entry->value->type != GCONF_VALUE_STRING)
-        return;
-
-    pkanchors = gconf_value_get_string (entry->value);
+    pkanchors = g_settings_get_string (settings, key);
 
     if (!pkanchors || !strlen(pkanchors))
         gtk_entry_set_text (GTK_ENTRY (prefs.pkanchors_entry), "");
@@ -216,37 +179,38 @@ ka_preferences_pkanchors_notify (GConfClient *client G_GNUC_UNUSED,
         const char *old_pkanchors;
 
         old_pkanchors = gtk_entry_get_text (GTK_ENTRY (prefs.pkanchors_entry));
-        if (!old_pkanchors || (old_pkanchors && strcmp (old_pkanchors, pkanchors)))
+        if (!old_pkanchors || (old_pkanchors && strcmp (old_pkanchors,
+                                                        pkanchors)))
             gtk_entry_set_text (GTK_ENTRY (prefs.pkanchors_entry), pkanchors);
     }
 }
 
-
 static void
 ka_preferences_pkanchors_changed (GtkEntry *entry,
-                                  gpointer userdata G_GNUC_UNUSED)
+                                  gpointer userdata)
 {
     const char *pkanchors;
+    KaApplet *applet = KA_APPLET(userdata);
 
     pkanchors = gtk_entry_get_text (entry);
 
     if (!pkanchors || !strlen(pkanchors))
-        gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_ANCHORS, NULL);
+        g_object_set (applet, KA_PROP_NAME_PK_ANCHORS, "", NULL);
     else
-        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_ANCHORS,
-                                 pkanchors, NULL);
+        g_object_set (applet, KA_PROP_NAME_PK_ANCHORS, pkanchors, NULL);
 }
 
 
 static void
-ka_preferences_setup_pkanchors_entry ()
+ka_preferences_setup_pkanchors_entry (KaApplet *applet)
 {
     char *pkanchors = NULL;
 
     prefs.pkanchors_entry = WID(prefs.builder, "pkanchors_entry");
     g_assert (prefs.pkanchors_entry != NULL);
 
-    if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PK_ANCHORS, &pkanchors))
+    g_object_get (applet, KA_PROP_NAME_PK_ANCHORS, &pkanchors, NULL);
+    if (!pkanchors)
         g_warning ("Getting pkanchors failed");
 
     if (pkanchors && strlen(pkanchors))
@@ -255,17 +219,7 @@ ka_preferences_setup_pkanchors_entry ()
         g_free (pkanchors);
 
     g_signal_connect (prefs.pkanchors_entry, "changed",
-                      G_CALLBACK (ka_preferences_pkanchors_changed), NULL);
-    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PK_ANCHORS, NULL)) {
-        gtk_widget_set_sensitive (prefs.pkanchors_entry, FALSE);
-    }
-
-    prefs.listeners [prefs.n_listeners] =
-        gconf_client_notify_add (prefs.client,
-                                 KA_GCONF_KEY_PK_ANCHORS,
-                                 (GConfClientNotifyFunc) ka_preferences_pkanchors_notify,
-                                 NULL, NULL, NULL);
-    prefs.n_listeners++;
+                      G_CALLBACK (ka_preferences_pkanchors_changed), applet);
 }
 
 
@@ -279,10 +233,11 @@ ka_preferences_toggle_pkuserid_entry (gboolean state, gpointer userdata G_GNUC_U
 
 static void
 ka_preferences_smartcard_toggled (GtkToggleButton *toggle,
-                                  gpointer userdata G_GNUC_UNUSED)
+                                  gpointer userdata)
 {
     gboolean smartcard = gtk_toggle_button_get_active (toggle);
     static gchar *old_path = NULL;
+    KaApplet *applet = KA_APPLET(userdata);
 
     if (smartcard) {
         const char *path;
@@ -292,31 +247,33 @@ ka_preferences_smartcard_toggled (GtkToggleButton *toggle,
             g_free (old_path);
             old_path = g_strdup (path);
         }
+
         ka_preferences_toggle_pkuserid_entry (FALSE, NULL);
-        gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_USERID, PKINIT_SMARTCARD, NULL);
+        g_object_set (applet, KA_SETTING_KEY_PK_USERID, PKINIT_SMARTCARD, NULL);
     } else {
         ka_preferences_toggle_pkuserid_entry (TRUE, NULL);
         if (old_path)
-            gconf_client_set_string (prefs.client, KA_GCONF_KEY_PK_USERID, old_path, NULL);
+            g_object_set (applet, KA_SETTING_KEY_PK_USERID, old_path, NULL);
         else
-            gconf_client_unset (prefs.client, KA_GCONF_KEY_PK_USERID, NULL);
+            g_object_set (applet, KA_SETTING_KEY_PK_USERID, old_path, "", NULL);
     }
 }
 
 
 static void
-ka_preferences_setup_smartcard_toggle ()
+ka_preferences_setup_smartcard_toggle (KaApplet *applet)
 {
     char *pkuserid = NULL;
 
     prefs.smartcard_toggle = WID (prefs.builder, "smartcard_toggle");
     g_assert (prefs.smartcard_toggle != NULL);
 
-    if (!ka_gconf_get_string (prefs.client, KA_GCONF_KEY_PK_USERID, &pkuserid))
-        g_warning ("Getting pkanchors failed");
+    g_object_get(applet, KA_PROP_NAME_PK_USERID, &pkuserid, NULL);
+    if (!pkuserid)
+        g_warning ("Getting pk userid failed");
 
     g_signal_connect (prefs.smartcard_toggle, "toggled",
-                      G_CALLBACK (ka_preferences_smartcard_toggled), NULL);
+                      G_CALLBACK (ka_preferences_smartcard_toggled), applet);
 
     if (!g_strcmp0 (pkuserid, PKINIT_SMARTCARD))
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.smartcard_toggle), TRUE);
@@ -411,279 +368,172 @@ ka_preferences_setup_pkanchors_button ()
 
 }
 
-
-static void
-ka_preferences_forwardable_toggled (GtkToggleButton *toggle,
-                                    gpointer userdata G_GNUC_UNUSED)
-{
-    gboolean forwardable;
-
-    forwardable = gtk_toggle_button_get_active (toggle);
-
-    gconf_client_set_bool (prefs.client, KA_GCONF_KEY_FORWARDABLE, forwardable, NULL);
-}
-
-
-static void
-ka_preferences_forwardable_notify (GConfClient *client G_GNUC_UNUSED,
-                                   guint cnx_id G_GNUC_UNUSED,
-                                   GConfEntry *entry,
-                                   gpointer userdata G_GNUC_UNUSED)
-{
-    gboolean forwardable;
-
-    if (!entry->value || entry->value->type != GCONF_VALUE_BOOL)
-      return;
-
-    forwardable = gconf_value_get_bool (entry->value) != FALSE;
-
-    if (forwardable != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs.forwardable_toggle)))
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.forwardable_toggle), forwardable);
-}
-
-
-static gboolean
-ka_preferences_setup_forwardable_toggle ()
-{
-    gboolean forwardable;
-
-    prefs.forwardable_toggle = WID (prefs.builder, "forwardable_toggle");
-    g_assert (prefs.forwardable_toggle != NULL);
-
-    forwardable = gconf_client_get_bool (prefs.client, KA_GCONF_KEY_FORWARDABLE, NULL);
-
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.forwardable_toggle), forwardable);
-
-    g_signal_connect (prefs.forwardable_toggle, "toggled",
-                      G_CALLBACK (ka_preferences_forwardable_toggled), NULL);
-
-    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_FORWARDABLE, NULL)) {
-        gtk_widget_set_sensitive (prefs.forwardable_toggle, FALSE);
-    }
-
-    prefs.listeners [prefs.n_listeners] =
-        gconf_client_notify_add (prefs.client,
-                                 KA_GCONF_KEY_FORWARDABLE,
-                                 (GConfClientNotifyFunc) ka_preferences_forwardable_notify,
-                                 NULL, NULL, NULL);
-    prefs.n_listeners++;
-    return forwardable;
-}
-
-
-static void
-ka_preferences_proxiable_toggled (GtkToggleButton *toggle,
-                                  gpointer userdata G_GNUC_UNUSED)
-{
-    gboolean proxiable;
-
-    proxiable = gtk_toggle_button_get_active (toggle);
-
-    gconf_client_set_bool (prefs.client, KA_GCONF_KEY_PROXIABLE, proxiable, NULL);
-}
-
-
 static void
-ka_preferences_proxiable_notify (GConfClient *client G_GNUC_UNUSED,
-                                 guint cnx_id G_GNUC_UNUSED,
-                                 GConfEntry *entry,
-                                 gpointer userdata G_GNUC_UNUSED)
+ka_preferences_setup_forwardable_toggle (KaApplet *applet)
 {
-    gboolean proxiable;
-
-    if (!entry->value || entry->value->type != GCONF_VALUE_BOOL)
-        return;
-
-    proxiable = gconf_value_get_bool (entry->value) != FALSE;
-
-    if (proxiable != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs.proxiable_toggle)))
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.proxiable_toggle), proxiable);
+    GBinding *binding;
+    GtkWidget *toggle;
+
+    toggle = WID (prefs.builder, "forwardable_toggle");
+    g_assert (toggle != NULL);
+
+    binding = g_object_bind_property (applet,
+                                      KA_PROP_NAME_TGT_FORWARDABLE,
+                                      toggle,
+                                      "active",
+                                      G_BINDING_BIDIRECTIONAL);
+    prefs.bindings[prefs.n_bindings] = binding;
+    prefs.n_bindings++;
 }
 
-
-static gboolean
-ka_preferences_setup_proxiable_toggle ()
-{
-    gboolean proxiable;
-
-    prefs.proxiable_toggle = WID (prefs.builder, "proxiable_toggle");
-    g_assert (prefs.proxiable_toggle != NULL);
-
-    proxiable = gconf_client_get_bool (prefs.client, KA_GCONF_KEY_PROXIABLE, NULL);
-
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.proxiable_toggle), proxiable);
-
-    g_signal_connect (prefs.proxiable_toggle, "toggled",
-                      G_CALLBACK (ka_preferences_proxiable_toggled), NULL);
-
-    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PROXIABLE, NULL)) {
-        gtk_widget_set_sensitive (prefs.proxiable_toggle, FALSE);
-    }
-
-    prefs.listeners [prefs.n_listeners] =
-        gconf_client_notify_add (prefs.client,
-                                 KA_GCONF_KEY_PROXIABLE,
-                                 (GConfClientNotifyFunc) ka_preferences_proxiable_notify,
-                                 NULL, NULL, NULL);
-    prefs.n_listeners++;
-    return proxiable;
-}
-
-
 static void
-ka_preferences_renewable_toggled (GtkToggleButton *toggle,
-                                  gpointer userdata G_GNUC_UNUSED)
+ka_preferences_setup_proxiable_toggle (KaApplet *applet)
 {
-    gboolean renewable;
-
-    renewable = gtk_toggle_button_get_active (toggle);
-
-    gconf_client_set_bool (prefs.client, KA_GCONF_KEY_RENEWABLE, renewable, NULL);
+    GBinding *binding;
+    GtkWidget *toggle;
+
+    toggle = WID (prefs.builder, "proxiable_toggle");
+    g_assert (toggle != NULL);
+
+    binding = g_object_bind_property (applet,
+                                      KA_PROP_NAME_TGT_PROXIABLE,
+                                      toggle,
+                                      "active",
+                                      G_BINDING_BIDIRECTIONAL);
+    prefs.bindings[prefs.n_bindings] = binding;
+    prefs.n_bindings++;
 }
 
-
 static void
-ka_preferences_renewable_notify (GConfClient *client G_GNUC_UNUSED,
-                                 guint cnx_id G_GNUC_UNUSED,
-                                 GConfEntry *entry,
-                                 gpointer userdata G_GNUC_UNUSED)
-{
-    gboolean renewable;
-
-    if (!entry->value || entry->value->type != GCONF_VALUE_BOOL)
-        return;
-
-    renewable = gconf_value_get_bool (entry->value) != FALSE;
-
-    if (renewable != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs.renewable_toggle)))
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.renewable_toggle), renewable);
-}
-
-
-static gboolean
-ka_preferences_setup_renewable_toggle ()
+ka_preferences_setup_renewable_toggle (KaApplet *applet)
 {
-    gboolean renewable;
-
-    prefs.renewable_toggle = WID (prefs.builder, "renewable_toggle");
-    g_assert (prefs.renewable_toggle != NULL);
-
-    renewable = gconf_client_get_bool (prefs.client, KA_GCONF_KEY_RENEWABLE, NULL);
-
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs.renewable_toggle), renewable);
-
-    g_signal_connect (prefs.renewable_toggle, "toggled",
-                      G_CALLBACK (ka_preferences_renewable_toggled), NULL);
-
-    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_RENEWABLE, NULL)) {
-        gtk_widget_set_sensitive (prefs.renewable_toggle, FALSE);
-    }
-
-    prefs.listeners [prefs.n_listeners] =
-        gconf_client_notify_add (prefs.client,
-                                 KA_GCONF_KEY_RENEWABLE,
-                                 (GConfClientNotifyFunc) ka_preferences_renewable_notify,
-                                 NULL, NULL, NULL);
-    prefs.n_listeners++;
-    return renewable;
+    GBinding *binding;
+    GtkWidget *toggle;
+
+    toggle = WID (prefs.builder, "renewable_toggle");
+    g_assert (toggle != NULL);
+
+    binding = g_object_bind_property (applet,
+                                      KA_PROP_NAME_TGT_RENEWABLE,
+                                      toggle,
+                                      "active",
+                                      G_BINDING_BIDIRECTIONAL);
+    prefs.bindings[prefs.n_bindings] = binding;
+    prefs.n_bindings++;
 }
 
 
 static void
 ka_preferences_prompt_mins_changed (GtkSpinButton *button,
-                                    gpointer userdata G_GNUC_UNUSED)
+                                    gpointer userdata)
 {
     gint prompt_mins;
+    KaApplet *applet = KA_APPLET(userdata);
 
     prompt_mins = gtk_spin_button_get_value_as_int (button);
-    gconf_client_set_int (prefs.client, KA_GCONF_KEY_PROMPT_MINS, prompt_mins, NULL);
+    g_object_set (applet, KA_PROP_NAME_PW_PROMPT_MINS, prompt_mins, NULL);
 }
 
 
 static void
-ka_preferences_prompt_mins_notify (GConfClient *client G_GNUC_UNUSED,
-                                   guint cnx_id G_GNUC_UNUSED,
-                                   GConfEntry *entry,
+ka_preferences_prompt_mins_notify (GSettings *settings,
+                                   gchar *key,
                                    gpointer userdata G_GNUC_UNUSED)
 {
     gint prompt_mins;
 
-    if (!entry->value || entry->value->type != GCONF_VALUE_INT)
-        return;
-
-    prompt_mins = gconf_value_get_int (entry->value);
-
-    if (prompt_mins != gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (prefs.prompt_mins_entry)))
-        gtk_spin_button_set_value (GTK_SPIN_BUTTON (prefs.prompt_mins_entry), prompt_mins);
+    prompt_mins = g_settings_get_int (settings, key);
+    if (prompt_mins != gtk_spin_button_get_value_as_int (
+            GTK_SPIN_BUTTON (prefs.prompt_mins_entry)))
+        gtk_spin_button_set_value (GTK_SPIN_BUTTON (prefs.prompt_mins_entry),
+                                   prompt_mins);
 }
 
-
-static gint
-ka_preferences_setup_prompt_mins_entry ()
+static void
+ka_preferences_setup_prompt_mins_entry (KaApplet *applet)
 {
     gint prompt_mins;
 
     prefs.prompt_mins_entry = WID (prefs.builder, "prompt_mins_entry");
     g_assert (prefs.prompt_mins_entry != NULL);
 
-    prompt_mins = gconf_client_get_int (prefs.client, KA_GCONF_KEY_PROMPT_MINS, NULL);
+    g_object_get (applet, KA_PROP_NAME_PW_PROMPT_MINS, &prompt_mins, NULL);
 
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (prefs.prompt_mins_entry), prompt_mins);
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (prefs.prompt_mins_entry),
+                               prompt_mins);
 
     g_signal_connect (prefs.prompt_mins_entry, "value-changed",
-                      G_CALLBACK (ka_preferences_prompt_mins_changed), NULL);
+                      G_CALLBACK (ka_preferences_prompt_mins_changed), applet);
+}
 
-    if (!gconf_client_key_is_writable (prefs.client, KA_GCONF_KEY_PROMPT_MINS, NULL)) {
-        gtk_widget_set_sensitive (prefs.prompt_mins_entry, FALSE);
-    }
 
-    prefs.listeners [prefs.n_listeners] =
-        gconf_client_notify_add (prefs.client,
-                                 KA_GCONF_KEY_PROMPT_MINS,
-                                 (GConfClientNotifyFunc) ka_preferences_prompt_mins_notify,
-                                 NULL, NULL, NULL);
-    prefs.n_listeners++;
-    return prompt_mins;
+static void
+ka_preferences_settings_changed (GSettings *settings,
+                                 gchar *key,
+                                 gpointer userdata)
+{
+    KaApplet *applet = KA_APPLET (userdata);
+
+    if (!g_strcmp0 (key, KA_SETTING_KEY_PRINCIPAL))
+        ka_preferences_principal_notify (settings, key, applet);
+    else if (!g_strcmp0(key, KA_SETTING_KEY_PK_USERID))
+        ka_preferences_pkuserid_notify (settings, key, applet);
+    else if (!g_strcmp0(key, KA_SETTING_KEY_PK_ANCHORS))
+        ka_preferences_pkanchors_notify (settings, key, applet);
+    else if (!g_strcmp0(key, KA_SETTING_KEY_PW_PROMPT_MINS))
+        ka_preferences_prompt_mins_notify (settings, key, applet);
 }
 
-
 void
-ka_preferences_window_create (KaApplet *applet G_GNUC_UNUSED,
+ka_preferences_window_create (KaApplet *applet,
                               GtkBuilder *xml)
 {
-    prefs.client = gconf_client_get_default ();
-    gconf_client_add_dir (prefs.client, KA_GCONF_PATH,
-                          GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-
     prefs.builder = xml;
-    ka_preferences_setup_principal_entry (prefs);
-    ka_preferences_setup_pkuserid_entry (prefs);
-    ka_preferences_setup_pkuserid_button (prefs);
-    ka_preferences_setup_smartcard_toggle (prefs);
-    ka_preferences_setup_pkanchors_entry(prefs);
-    ka_preferences_setup_pkanchors_button (prefs);
-    ka_preferences_setup_forwardable_toggle (prefs);
-    ka_preferences_setup_proxiable_toggle (prefs);
-    ka_preferences_setup_renewable_toggle (prefs);
-    ka_preferences_setup_prompt_mins_entry (prefs);
-
-    g_assert (prefs.n_listeners == N_LISTENERS);
+    ka_preferences_setup_principal_entry (applet);
+    ka_preferences_setup_pkuserid_entry (applet);
+    ka_preferences_setup_pkuserid_button (applet);
+    ka_preferences_setup_smartcard_toggle (applet);
+    ka_preferences_setup_pkanchors_entry (applet);
+    ka_preferences_setup_pkanchors_button (applet);
+
+    ka_preferences_setup_forwardable_toggle (applet);
+    ka_preferences_setup_proxiable_toggle (applet);
+    ka_preferences_setup_renewable_toggle (applet);
+    ka_preferences_setup_prompt_mins_entry (applet);
+
+    g_signal_connect (ka_applet_get_settings(applet),
+                      "changed",
+                      G_CALLBACK (ka_preferences_settings_changed),
+                      applet);
+
+    g_assert (prefs.n_bindings == N_BINDINGS);
 
     prefs.notebook = WID (xml, "ka_notebook");
     prefs.dialog = WID (xml, "krb5_preferences_dialog");
-
 }
 
 void
-ka_preferences_window_show (GtkWindow *main_window)
+ka_preferences_window_show (KaApplet *applet)
 {
-    if (main_window)
-        gtk_window_set_transient_for (GTK_WINDOW(prefs.dialog), main_window);
+    GtkWindow *parent = ka_applet_last_focused_window (applet);
+
+    if (parent)
+        gtk_window_set_transient_for (GTK_WINDOW(prefs.dialog),
+                                      GTK_WINDOW(parent));
     gtk_window_present (GTK_WINDOW(prefs.dialog));
     gtk_dialog_run (GTK_DIALOG (prefs.dialog));
     gtk_widget_hide (prefs.dialog);
 }
 
+void
+ka_preferences_window_destroy ()
+{
+    int i;
+
+    for (i = 0; i < prefs.n_bindings; i++)
+        g_object_unref (prefs.bindings[i]);
+}
+
 /*
  * vim:ts:sts=4:sw=4:et:
  */
diff --git a/src/ka-preferences.h b/src/ka-preferences.h
index 7f8e9a2..6f767c5 100644
--- a/src/ka-preferences.h
+++ b/src/ka-preferences.h
@@ -10,7 +10,9 @@
 G_BEGIN_DECLS
 
 void ka_preferences_window_create (KaApplet *applet, GtkBuilder *xml);
-void ka_preferences_window_show (GtkWindow *main_window);
+void ka_preferences_window_destroy (void);
+void ka_preferences_window_show (KaApplet *applet);
+
 
 G_END_DECLS
 
diff --git a/src/ka-pwdialog.c b/src/ka-pwdialog.c
index 483873a..5e56d8b 100644
--- a/src/ka-pwdialog.c
+++ b/src/ka-pwdialog.c
@@ -1,6 +1,6 @@
 /* Krb5 Auth Applet -- Acquire and release kerberos tickets
  *
- * (C) 2009 Guido Guenther <agx@sigxcpu.org>
+ * (C) 2009,2013 Guido Guenther <agx@sigxcpu.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -88,17 +88,57 @@ ka_pwdialog_new (void)
     return g_object_new (KA_TYPE_PWDIALOG, NULL);
 }
 
+static GdkGrabStatus
+for_each_keyboard (GdkWindow *window, GdkEvent *event,
+                   GdkGrabStatus (*func)(GdkDevice*,
+                                         GdkWindow*,
+                                         GdkEvent*))
+{
+    GdkDisplay *display;
+    GdkDeviceManager *device_manager;
+    GdkDevice *device;
+    GList *devices, *dev;
+    GdkGrabStatus ret = GDK_GRAB_SUCCESS;
+
+    display = gdk_window_get_display (window);
+    device_manager = gdk_display_get_device_manager (display);
+    devices = gdk_device_manager_list_devices (device_manager,
+                                               GDK_DEVICE_TYPE_MASTER);
+
+    for (dev = devices; dev; dev = dev->next) {
+        device = dev->data;
+        if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD)
+            continue;
+        ret = (*func)(device, window, event);
+    }
+
+    g_list_free (devices);
+    return ret;
+}
+
+static GdkGrabStatus
+grab_keyboard_func (GdkDevice *device, GdkWindow *window, GdkEvent *event)
+{
+    return gdk_device_grab (device,
+                            window,
+                            GDK_OWNERSHIP_WINDOW,
+                            FALSE,
+                            GDK_ALL_EVENTS_MASK,
+                            NULL,
+                            gdk_event_get_time (event));
+}
 
 static gboolean
 grab_keyboard (GtkWidget *win, GdkEvent * event, gpointer data)
 {
     KaPwDialog *pwdialog = KA_PWDIALOG (data);
-
     GdkGrabStatus status;
 
     if (!pwdialog->priv->grabbed) {
-        status = gdk_keyboard_grab (gtk_widget_get_window (win),
-                                    FALSE, gdk_event_get_time (event));
+        status = for_each_keyboard(gtk_widget_get_window (win),
+                                   event,
+                                   &grab_keyboard_func);
+
         if (status == GDK_GRAB_SUCCESS)
             pwdialog->priv->grabbed = TRUE;
         else
@@ -107,6 +147,15 @@ grab_keyboard (GtkWidget *win, GdkEvent * event, gpointer data)
     return FALSE;
 }
 
+static GdkGrabStatus
+ungrab_keyboard_func (GdkDevice *device,
+                      GdkWindow *window G_GNUC_UNUSED,
+                      GdkEvent *event)
+{
+    gdk_device_ungrab (device,
+                       gdk_event_get_time (event));
+    return 0;
+}
 
 static gboolean
 ungrab_keyboard (GtkWidget *win G_GNUC_UNUSED,
@@ -114,9 +163,12 @@ ungrab_keyboard (GtkWidget *win G_GNUC_UNUSED,
 {
     KaPwDialog *pwdialog = KA_PWDIALOG (data);
 
-    if (pwdialog->priv->grabbed)
-        gdk_keyboard_ungrab (gdk_event_get_time (event));
-    pwdialog->priv->grabbed = FALSE;
+    if (pwdialog->priv->grabbed) {
+        for_each_keyboard(gtk_widget_get_window (win),
+                          event,
+                          &ungrab_keyboard_func);
+        pwdialog->priv->grabbed = FALSE;
+    }
     return FALSE;
 }
 
diff --git a/src/ka-settings.c b/src/ka-settings.c
new file mode 100644
index 0000000..a2baab4
--- /dev/null
+++ b/src/ka-settings.c
@@ -0,0 +1,59 @@
+/* Krb5 Auth Applet -- Acquire and release kerberos tickets
+ *
+ * (C) 2008,2009,2013 Guido Guenther <agx@sigxcpu.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+#include "config.h"
+
+#include <string.h>
+
+#include "ka-applet-priv.h"
+#include "ka-settings.h"
+
+#define do_binding(NAME) \
+    g_settings_bind(settings, \
+        KA_SETTING_KEY_##NAME,\
+        applet,               \
+        KA_PROP_NAME_##NAME,  \
+        G_SETTINGS_BIND_DEFAULT)
+
+static void
+ka_setup_bindings(KaApplet* applet,
+                  GSettings* settings)
+{
+    do_binding(PRINCIPAL);
+    do_binding(PK_USERID);
+    do_binding(PK_ANCHORS);
+    do_binding(PW_PROMPT_MINS);
+    do_binding(TGT_FORWARDABLE);
+    do_binding(TGT_PROXIABLE);
+    do_binding(TGT_RENEWABLE);
+    do_binding(CONF_TICKETS);
+}
+
+#undef do_binding
+
+GSettings*
+ka_settings_init (KaApplet* applet)
+{
+    GSettings *settings;
+
+    settings = g_settings_new (KA_SETTING_SCHEMA);
+
+    ka_setup_bindings(applet, settings);
+    return settings;
+}
diff --git a/src/ka-gconf.h b/src/ka-settings.h
index a6b3872..029c429 100644
--- a/src/ka-gconf.h
+++ b/src/ka-settings.h
@@ -21,9 +21,24 @@
 #ifndef KA_GCONF_H
 #define KA_GCONF_H
 
-#include <gconf/gconf-client.h>
 #include "ka-applet-priv.h"
 
-GConfClient* ka_gconf_init (KaApplet* applet);
+#define KA_SETTING_SCHEMA               "org.gnome.KrbAuthDialog"
+#define KA_SETTING_KEY_PRINCIPAL        "principal"
+#define KA_SETTING_KEY_PK_USERID        "pk-userid"
+#define KA_SETTING_KEY_PK_ANCHORS       "pk-anchors"
+#define KA_SETTING_KEY_PW_PROMPT_MINS   "prompt-minutes"
+#define KA_SETTING_KEY_TGT_FORWARDABLE  "forwardable"
+#define KA_SETTING_KEY_TGT_RENEWABLE    "renewable"
+#define KA_SETTING_KEY_TGT_PROXIABLE    "proxiable"
+#define KA_SETTING_KEY_CONF_TICKETS     "conf-tickets"
+#define KA_SETTING_CHILD_NOTIFY         "notify"
+#define KA_SETTING_KEY_NOTIFY_VALID     "valid"
+#define KA_SETTING_KEY_NOTIFY_EXPIRED   "expired"
+#define KA_SETTING_KEY_NOTIFY_EXPIRING  "expiring"
+#define KA_SETTING_CHILD_PLUGINS        "plugins"
+#define KA_SETTING_KEY_PLUGINS_ENABLED  "enabled"
+
+GSettings* ka_settings_init (KaApplet* applet);
 
 #endif
diff --git a/src/ka-tools.c b/src/ka-tools.c
index 227324a..18f9ba8 100644
--- a/src/ka-tools.c
+++ b/src/ka-tools.c
@@ -58,8 +58,10 @@ ka_show_help (GdkScreen* screen, const char* chapter, GtkWindow* window)
 
 
 void 
-ka_show_about ()
+ka_show_about (KaApplet *applet)
 {
+    GtkWindow *parent = ka_applet_last_focused_window (applet);
+
     const gchar *authors[] = {
         "Christopher Aillon <caillon@redhat.com>",
         "Jonathan Blandford <jrb@redhat.com>",
@@ -68,7 +70,7 @@ ka_show_about ()
         NULL
     };
 
-    gtk_show_about_dialog (NULL,
+    gtk_show_about_dialog (parent,
                            "authors", authors,
                            "version", VERSION,
                            "logo-icon-name", "krb-valid-ticket",
diff --git a/src/ka-tools.h b/src/ka-tools.h
index 4fef541..18ddf45 100644
--- a/src/ka-tools.h
+++ b/src/ka-tools.h
@@ -22,11 +22,12 @@
 #define KA_TOOLS
 
 #include <gtk/gtk.h>
+#include <ka-applet-priv.h>
 
 G_BEGIN_DECLS
 
 void ka_show_help (GdkScreen* screen, const char* section, GtkWindow* window);
-void ka_show_about (void);
+void ka_show_about (KaApplet *applet);
 
 G_END_DECLS
 
diff --git a/src/krb5-auth-dialog.desktop.in b/src/krb5-auth-dialog.desktop.in
index 7c2223a..33ac10d 100644
--- a/src/krb5-auth-dialog.desktop.in
+++ b/src/krb5-auth-dialog.desktop.in
@@ -9,3 +9,4 @@ Categories=GNOME;GTK;Utility;Network;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=krb5-auth-dialog
 X-GNOME-Bugzilla-Component=general
+X-GNOME-UsesNotifications=true
diff --git a/src/krb5-auth-dialog.schemas.in b/src/krb5-auth-dialog.schemas.in
deleted file mode 100644
index 4a88f2b..0000000
--- a/src/krb5-auth-dialog.schemas.in
+++ /dev/null
@@ -1,146 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/principal</key>
-      <applyto>/apps/krb5-auth-dialog/principal</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>string</type>
-      <default></default>
-
-      <locale name="C">
-        <short>Kerberos principal</short>
-        <long>The kerberos principal to acquire the ticket for</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/pk_userid</key>
-      <applyto>/apps/krb5-auth-dialog/pk_userid</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>string</type>
-      <default></default>
-
-      <locale name="C">
-        <short>PKINIT identifier</short>
-        <long>The principal's public/private/certificate identifier when using PKINIT</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/pk_anchors</key>
-      <applyto>/apps/krb5-auth-dialog/pk_anchors</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>string</type>
-      <default></default>
-
-      <locale name="C">
-        <short>PKINIT trust anchors</short>
-        <long>PKINIT CA certificates</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/prompt_minutes</key>
-      <applyto>/apps/krb5-auth-dialog/prompt_minutes</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>int</type>
-      <default>30</default>
-
-      <locale name="C">
-        <short>Prompt minutes before expiry</short>
-        <long>Start prompting/displaying notifications that many minutes before expiry</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/forwardable</key>
-      <applyto>/apps/krb5-auth-dialog/forwardable</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>0</default>
-
-      <locale name="C">
-        <short>Forwardable ticket</short>
-        <long>Requested tickets should be forwardable</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/renewable</key>
-      <applyto>/apps/krb5-auth-dialog/renewable</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>0</default>
-
-      <locale name="C">
-        <short>Renewable ticket</short>
-        <long>Requested tickets should be renewable</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/proxiable</key>
-      <applyto>/apps/krb5-auth-dialog/proxiable</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>0</default>
-
-      <locale name="C">
-        <short>Proxiable ticket</short>
-        <long>Requested tickets should be proxiable</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/notify/valid</key>
-      <applyto>/apps/krb5-auth-dialog/notify/valid</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>1</default>
-
-      <locale name="C">
-        <short>valid ticket notification</short>
-        <long>Notify user when ticket becomes valid</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/notify/expiring</key>
-      <applyto>/apps/krb5-auth-dialog/notify/expiring</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>1</default>
-
-      <locale name="C">
-        <short>ticket expiring notification</short>
-        <long>Notify user when ticket is about to expire</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/notify/expired</key>
-      <applyto>/apps/krb5-auth-dialog/notify/expired</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>bool</type>
-      <default>1</default>
-
-      <locale name="C">
-        <short>ticket expired notification</short>
-        <long>Notify user when ticket has expired</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/krb5-auth-dialog/plugins/enabled</key>
-      <applyto>/apps/krb5-auth-dialog/plugins/enabled</applyto>
-      <owner>krb5-auth-dialog</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-
-      <locale name="C">
-        <short>Enabled plugins</short>
-	<long>List of plugins that should be loaded and activated on startup.</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
diff --git a/src/krb5-auth-dialog.ui b/src/krb5-auth-dialog.ui
index 1da04d7..3bbcdbf 100644
--- a/src/krb5-auth-dialog.ui
+++ b/src/krb5-auth-dialog.ui
@@ -1,6 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
+  <menu id="app-menu">
+    <section>
+      <item>
+        <attribute name="action">app.preferences</attribute>
+        <attribute name="label" translatable="yes">Prefere_nces</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="action">app.about</attribute>
+        <attribute name="label" translatable="yes">_About</attribute>
+      </item>
+      <item>
+        <attribute name="action">app.help</attribute>
+        <attribute name="label" translatable="yes">_Help</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="action">app.quit</attribute>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+      </item>
+    </section>
+  </menu>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -29,7 +53,6 @@
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -46,7 +69,6 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -181,7 +203,7 @@
       <action-widget response="-5">krb5_renew_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkWindow" id="krb5_main_window">
+  <object class="GtkApplicationWindow" id="krb5_main_window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Service Tickets</property>
     <signal name="delete-event" handler="ka_main_window_hide" swapped="no"/>
@@ -190,102 +212,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkMenuBar" id="menubar1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkMenuItem" id="menuitem1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">_File</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="menuitem_close">
-                        <property name="label">gtk-close</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="menuitem2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">_Edit</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="menuitem_preferences">
-                        <property name="label">gtk-preferences</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="menuitem4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">_Help</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="menuitem_help_contents">
-                        <property name="label">gtk-help</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="menuitem_about">
-                        <property name="label">gtk-about</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkTreeView" id="krb5_tickets_treeview">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -324,7 +250,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -541,7 +466,6 @@
                                     <property name="has_tooltip">True</property>
                                     <property name="tooltip_markup" translatable="yes">If checked, request forwardable tickets</property>
                                     <property name="tooltip_text" translatable="yes">If checked, request forwardable tickets</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
@@ -583,7 +507,6 @@
                                     <property name="has_tooltip">True</property>
                                     <property name="tooltip_markup" translatable="yes">If checked, request renewable tickets</property>
                                     <property name="tooltip_text" translatable="yes">If checked, request renewable tickets</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
@@ -625,7 +548,6 @@
                                     <property name="has_tooltip">True</property>
                                     <property name="tooltip_markup" translatable="yes">If checked, request proxiable tickets</property>
                                     <property name="tooltip_text" translatable="yes">If checked, request proxiable tickets</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
@@ -744,7 +666,6 @@
                                         <property name="has_tooltip">True</property>
                                         <property name="tooltip_markup" translatable="yes">If checked, use a security token (Smartcard) to authenticate.</property>
                                         <property name="tooltip_text" translatable="yes">If checked, use a security token (Smartcard) to authenticate.</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
@@ -799,7 +720,6 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
@@ -892,7 +812,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -1019,9 +938,9 @@
                                 <property name="tooltip_text" translatable="yes">Send notification about ticket expiry that many minutes before it finally expires</property>
                                 <property name="invisible_char">●</property>
                                 <property name="invisible_char_set">True</property>
+                                <property name="adjustment">adjustment1</property>
                                 <property name="snap_to_ticks">True</property>
                                 <property name="numeric">True</property>
-				<property name="adjustment">adjustment1</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
diff --git a/src/org.gnome.KrbAuthDialog.convert b/src/org.gnome.KrbAuthDialog.convert
new file mode 100644
index 0000000..f71168e
--- /dev/null
+++ b/src/org.gnome.KrbAuthDialog.convert
@@ -0,0 +1,13 @@
+[org.gnome.KrbAuthDialog]
+principal = /apps/krb5-auth-dialog/principal
+pk-userid = /apps/krb5-auth-dialog/pk_userid
+pk-anchors = /apps/krb5-auth-dialog/pk_anchors
+prompt-minutes = /apps/krb5-auth-dialog/prompt_minutes
+
+[org.gnome.KrbAuthDialog.notify]
+valid = /apps/krb5-auth-dialog/notify/valid
+expiring = /apps/krb5-auth-dialog/notify/expiring
+expired = /apps/krb5-auth-dialog/notify/expired
+
+[org.gnome.KrbAuthDialog.plugins]
+enabled = /apps/krb5-auth-dialog/plugins/enabled
diff --git a/src/org.gnome.KrbAuthDialog.gschema.xml b/src/org.gnome.KrbAuthDialog.gschema.xml
new file mode 100644
index 0000000..4764744
--- /dev/null
+++ b/src/org.gnome.KrbAuthDialog.gschema.xml
@@ -0,0 +1,70 @@
+<schemalist>
+  <schema id="org.gnome.KrbAuthDialog" path="/apps/krb5-auth-dialog/">
+    <key name="principal" type="s">
+      <default>''</default>
+      <summary>Kerberos principal</summary>
+      <description>The Kerberos principal to acquire the ticket for</description>
+    </key>
+    <key name="pk-userid" type="s">
+      <default>''</default>
+      <summary>PKINIT identifier</summary>
+      <description>The principal's public/private/certificate identifier when using PKINIT</description>
+    </key>
+    <key name="pk-anchors" type="s">
+      <default>''</default>
+      <summary>PKINIT trust anchors</summary>
+      <description>PKINIT CA certificates</description>
+    </key>
+    <key name="prompt-minutes" type="i">
+      <default>30</default>
+      <summary>Prompt minutes before expiry</summary>
+      <description>Start prompting/displaying notifications that many minutes before expiry</description>
+    </key>
+    <key name="forwardable" type="b">
+      <default>false</default>
+      <summary>Forwardable ticket</summary>
+      <description>Requested tickets should be forwardable</description>
+    </key>
+    <key name="renewable" type="b">
+      <default>false</default>
+      <summary>Renewable ticket</summary>
+      <description>Requested tickets should be renewable</description>
+    </key>
+    <key name="proxiable" type="b">
+      <default>false</default>
+      <summary>Proxiable ticket</summary>
+      <description>Requested tickets should be proxiable</description>
+    </key>
+    <key name="conf-tickets" type="b">
+      <default>false</default>
+      <summary>Configuration tickets</summary>
+      <description>Show configuration tickets</description>
+    </key>
+    <child name="notify" schema="org.gnome.KrbAuthDialog.notify"/>
+    <child name="plugins" schema="org.gnome.KrbAuthDialog.plugins"/>
+  </schema>
+  <schema id="org.gnome.KrbAuthDialog.notify" path="/apps/krb5-auth-dialog/notify/">
+    <key name="valid" type="b">
+      <default>true</default>
+      <summary>valid ticket notification</summary>
+      <description>Notify user when ticket becomes valid</description>
+    </key>
+    <key name="expiring" type="b">
+      <default>true</default>
+      <summary>ticket expiring notification</summary>
+      <description>Notify user when ticket is about to expire</description>
+    </key>
+    <key name="expired" type="b">
+      <default>true</default>
+      <summary>ticket expired notification</summary>
+      <description>Notify user when ticket has expired</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.KrbAuthDialog.plugins" path="/apps/krb5-auth-dialog/plugins/">
+    <key name="enabled" type="as">
+      <default>[]</default>
+      <summary>Enabled plugins</summary>
+      <description>List of plugins that should be loaded and activated on startup.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/ylwrap b/ylwrap
index 84d5634..9253635 100755
--- a/ylwrap
+++ b/ylwrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-08-25.18; # UTC
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007, 2009 Free Software Foundation, Inc.
+# 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
@@ -99,7 +99,11 @@ esac
 # FIXME: add hostname here for parallel makes that run commands on
 # other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
-trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
+trap "ret=129; $do_exit" 1
+trap "ret=130; $do_exit" 2
+trap "ret=141; $do_exit" 13
+trap "ret=143; $do_exit" 15
 mkdir $dirname || exit 1
 
 cd $dirname
@@ -133,19 +137,19 @@ if test $ret -eq 0; then
     # Handle y_tab.c and y_tab.h output by DOS
     if test $y_tab_nodot = "yes"; then
       if test $from = "y.tab.c"; then
-    	from="y_tab.c"
+        from="y_tab.c"
       else
-    	if test $from = "y.tab.h"; then
-    	  from="y_tab.h"
-    	fi
+        if test $from = "y.tab.h"; then
+          from="y_tab.h"
+        fi
       fi
     fi
     if test -f "$from"; then
       # If $2 is an absolute path name, then just use that,
       # otherwise prepend `../'.
       case "$2" in
-    	[\\/]* | ?:[\\/]*) target="$2";;
-    	*) target="../$2";;
+        [\\/]* | ?:[\\/]*) target="$2";;
+        *) target="../$2";;
       esac
 
       # We do not want to overwrite a header file if it hasn't
@@ -155,8 +159,8 @@ if test $ret -eq 0; then
       # Makefile.  Divert the output of all other files to a temporary
       # file so we can compare them to existing versions.
       if test $first = no; then
-	realtarget="$target"
-	target="tmp-`echo $target | sed s/.*[\\/]//g`"
+        realtarget="$target"
+        target="tmp-`echo $target | sed s/.*[\\/]//g`"
       fi
       # Edit out `#line' or `#' directives.
       #
@@ -180,10 +184,10 @@ if test $ret -eq 0; then
 
       # Check whether header files must be updated.
       if test $first = no; then
-	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-	  echo "$2" is unchanged
-	  rm -f "$target"
-	else
+        if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+          echo "$2" is unchanged
+          rm -f "$target"
+        else
           echo updating "$2"
           mv -f "$target" "$realtarget"
         fi
author	Guido Günther <agx@sigxcpu.org>	2013-03-31 16:24:35 +0200
committer	Guido Günther <agx@sigxcpu.org>	2013-03-31 16:24:35 +0200
commit	6c66f3c0bfc6c655c53e552ba8ef487700a6e0bc (patch)
tree	ec0da0d6be6e02f3e237ec35743f213df218f7d2
parent	New upstream version 3.2.1 (diff)
download	krb5-auth-dialog-6c66f3c0bfc6c655c53e552ba8ef487700a6e0bc.tar.gz krb5-auth-dialog-6c66f3c0bfc6c655c53e552ba8ef487700a6e0bc.tar.bz2 krb5-auth-dialog-6c66f3c0bfc6c655c53e552ba8ef487700a6e0bc.zip