Merge commit 'upstream/3.2.1'

17 files changed, 579 insertions, 481 deletions

diff --git a/ChangeLog b/ChangeLog
index 4cd07a9..f246643 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,86 @@
 # Generated by Makefile. Do not edit.
 
+commit f7414096623e564d9d26794b7cc1cb3ab680929d
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Oct 16 18:41:00 2011 +0200
+
+    Bump version to 3.2.1
+
+ NEWS         |   13 +++++++++++++
+ configure.ac |    2 +-
+ 2 files changed, 14 insertions(+), 1 deletions(-)
+
+commit 9f435e2c60a8bea0c196be393125f6f8767e7afd
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Sun Oct 16 18:51:18 2011 +0200
+
+    Remove cc-panel/
+
+ cc-panel/.gitignore |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit aba3a821e5ea990701ca060bcc1ee40eb0d884ca
+Author: Zdeněk Hataš <zdenek.hatas@gmail.com>
+Date:   Tue Oct 4 11:38:35 2011 +0200
+
+    Updated Czech translation
+
+ po/cs.po |  501 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 252 insertions(+), 249 deletions(-)
+
+commit 5096ce0e7364523e85ccee9da224133a7a5354bf
+Author: Claude Paroz <claude@2xlibre.net>
+Date:   Sat Oct 1 23:20:37 2011 +0200
+
+    Updated French translation
+
+ po/fr.po |  353 +++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 176 insertions(+), 177 deletions(-)
+
+commit feea4b3e8b0ac9a2b7d61653f13dd7531245584e
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:   Sat Oct 1 11:48:06 2011 +0200
+
+    Updated Spanish translation
+
+ help/es/es.po |   31 ++++++++++++++-----------------
+ 1 files changed, 14 insertions(+), 17 deletions(-)
+
+commit 7f943685c00ea659b732c81e56ff5e5b831db5eb
+Author: Zdenek Hatas <zdenek.hatas@gmail.com>
+Date:   Thu Sep 29 16:12:19 2011 +0200
+
+    Fixed typo in documentation: applet doesn't have --always option
+    
+    Signed-off-by: Zdeněk Hataš <zdenek.hatas@gmail.com>
+    Signed-off-by: Guido Günther <agx@sigxcpu.org>
+
+ help/C/krb5-auth-dialog.xml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 15fde0ec01fd3c55e886e077e3a8dcd2c24fd02c
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Tue Sep 27 20:47:54 2011 +0200
+
+    Register org.gnome.KrbAuthDialog early
+    
+    and get the bus via g_bus_get_sync unbreak DBus activation.
+
+ src/ka-applet.c |    6 ++----
+ src/ka-dbus.c   |   20 +++++++++-----------
+ 2 files changed, 11 insertions(+), 15 deletions(-)
+
+commit 256cd8abe47a7d762d738295e1c8f3ca90ab7590
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Tue Sep 27 11:52:37 2011 +0200
+
+    Add categories to desktop file
+    
+    BZ: #660227
+
+ src/krb5-auth-dialog.desktop.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
 commit 1c89fe8b203c85dcb4ff06fb8da34e411eb56730
 Author: Guido Günther <agx@sigxcpu.org>
 Date:   Mon Sep 26 22:13:36 2011 +0200
diff --git a/NEWS b/NEWS
index 8a1347c..02b241d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,17 @@
 ==============
+Version 3.2.1
+==============
+* Fix DBus activation
+* Add missing categories to the desktop file
+* Fix options in documentation
+* UI translations:
+	Claude Paroz (fr)
+	Zdeněk Hataš (cs)
+
+* Doc translations:
+	Daniel Mustieles (es)
+
+==============
 Version 3.2.0
 ==============
 * Use GtkApplication
diff --git a/configure b/configure
index e235a6b..4572dc7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for krb5-auth-dialog 3.2.0.
+# Generated by GNU Autoconf 2.68 for krb5-auth-dialog 3.2.1.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='krb5-auth-dialog'
 PACKAGE_TARNAME='krb5-auth-dialog'
-PACKAGE_VERSION='3.2.0'
-PACKAGE_STRING='krb5-auth-dialog 3.2.0'
+PACKAGE_VERSION='3.2.1'
+PACKAGE_STRING='krb5-auth-dialog 3.2.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1417,7 +1417,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.0 to adapt to many kinds of systems.
+\`configure' configures krb5-auth-dialog 3.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1488,7 +1488,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of krb5-auth-dialog 3.2.0:";;
+     short | recursive ) echo "Configuration of krb5-auth-dialog 3.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1647,7 +1647,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-krb5-auth-dialog configure 3.2.0
+krb5-auth-dialog configure 3.2.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2069,7 +2069,7 @@ 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.0, which was
+It was created by krb5-auth-dialog $as_me 3.2.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2885,7 +2885,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='krb5-auth-dialog'
- VERSION='3.2.0'
+ VERSION='3.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16336,7 +16336,7 @@ 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.0, which was
+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
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16402,7 +16402,7 @@ _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.0
+krb5-auth-dialog config.status 3.2.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 083ea3f..43c84e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([krb5-auth-dialog],[3.2.0])
+AC_INIT([krb5-auth-dialog],[3.2.1])
 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])
diff --git a/help/C/krb5-auth-dialog.xml b/help/C/krb5-auth-dialog.xml
index ead303b..d16862f 100644
--- a/help/C/krb5-auth-dialog.xml
+++ b/help/C/krb5-auth-dialog.xml
@@ -153,14 +153,14 @@
       <term>Command line</term>
       <listitem>
 	<para>
-	  Type <command>krb5-auth-dialog --always</command>,
+	  Type <command>krb5-auth-dialog</command>,
           then press <keycap>Return</keycap>:
         </para>
       </listitem>
     </varlistentry>
   </variablelist>
   <para>
-    The tray icon will indicate one of tree states:
+    The tray icon will indicate one of three states:
   </para>
 
   <section id="trayicon-valid">
diff --git a/help/de/krb5-auth-dialog.xml b/help/de/krb5-auth-dialog.xml
index b7bb1a0..98d99d2 100644
--- a/help/de/krb5-auth-dialog.xml
+++ b/help/de/krb5-auth-dialog.xml
@@ -144,11 +144,16 @@
     <varlistentry>
       <term>Befehlszeile</term>
       <listitem>
-	<para>Geben Sie <command>krb5-auth-dialog --always</command> ein und drücken Sie anschließend die <keycap>Eingabetaste</keycap>:</para>
+	<para>
+	  Type <command>krb5-auth-dialog</command>,
+          then press <keycap>Return</keycap>:
+        </para>
       </listitem>
     </varlistentry>
   </variablelist>
-  <para>Das Symbol im Benachrichtigungsfeld zeigt einen der folgenden drei Zustände an:</para>
+  <para>
+    The tray icon will indicate one of three states:
+  </para>
 
   <section id="trayicon-valid">
     <title>Gültiges Kerberos-Ticket</title>
diff --git a/help/es/es.po b/help/es/es.po
index 9ca1125..556322d 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -2,13 +2,13 @@
 # Spanish translation of krb5-auth-dialog.
 # Copyright (C) 2009 krb5-auth-dialog's COPYRIGHT HOLDER
 # This file is distributed under the same license as the krb5-auth-dialog package.
+# Jorge González <jorgegonz@svn.gnome.org>, 2009, 2011.
 #
-# Jorge González <jorgegonz@svn.gnome.org>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: krb5-auth-dialog.help.master\n"
-"POT-Creation-Date: 2009-07-02 11:33+0000\n"
-"PO-Revision-Date: 2009-07-09 21:06+0200\n"
+"POT-Creation-Date: 2011-09-29 15:56+0000\n"
+"PO-Revision-Date: 2011-10-01 11:45+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -312,15 +312,16 @@ msgid "Command line"
 msgstr "Línea de comandos"
 
 #: C/krb5-auth-dialog.xml:155(para)
+#| msgid ""
+#| "Type <command>krb5-auth-dialog --always</command>, then press "
+#| "<keycap>Return</keycap>:"
 msgid ""
-"Type <command>krb5-auth-dialog --always</command>, then press "
-"<keycap>Return</keycap>:"
-msgstr ""
-"Escriba <command>krb5-auth-dialog --always</command> después pulse "
-"<keycap>Intro</keycap>:"
+"Type <command>krb5-auth-dialog</command>, then press <keycap>Return</keycap>:"
+msgstr "Escriba <command>krb5-auth-dialog</command> y <keycap>Intro</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 tree states:"
+msgid "The tray icon will indicate one of three states:"
 msgstr "El icono de la bandeja indicará uno de estos tres estados:"
 
 #: C/krb5-auth-dialog.xml:167(title) C/krb5-auth-dialog.xml:170(title)
@@ -448,10 +449,6 @@ msgid "Kerberos Principal"
 msgstr "Principal de Kerberos"
 
 #: C/krb5-auth-dialog.xml:289(para)
-#| msgid ""
-#| "The Kerberos principal to use. Leave blanc to use you current username. "
-#| "If you change this setting you have to destroy the credential cache "
-#| "before these setting takes effect."
 msgid ""
 "The Kerberos principal to use. Leave blank to use you current username. If "
 "you change this setting you have to destroy the credential cache before "
@@ -563,9 +560,9 @@ msgid ""
 "You can set preferences by selecting \"Preferences\" from the applets "
 "context menu or by selecting \"Network Authentication\" in the "
 "<application>Control Center</application>. <table frame=\"topbot\" id=\"tbl-"
-"principal-prefs\"><placeholder-1/><tgroup cols=\"2\" colsep=\"1\" rowsep=\"1"
-"\"><colspec colwidth=\"19.21*\"/><colspec colwidth=\"46.79*\"/><placeholder-"
-"2/><placeholder-3/></tgroup></table>"
+"principal-prefs\"><placeholder-1/><tgroup cols=\"2\" colsep=\"1\" rowsep="
+"\"1\"><colspec colwidth=\"19.21*\"/><colspec colwidth=\"46.79*\"/"
+"><placeholder-2/><placeholder-3/></tgroup></table>"
 msgstr ""
 "Puede establecer sus preferencias seleccionando «Preferencias» del menú "
 "contextual de la miniaplicación o seleccionando «Autenticación de red» en el "
@@ -574,7 +571,7 @@ msgstr ""
 "rowsep=\"1\"><colspec colwidth=\"19.21*\"/><colspec colwidth=\"46.79*\"/"
 "><placeholder-2/><placeholder-3/></tgroup></table>"
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
 #: C/krb5-auth-dialog.xml:0(None)
 msgid "translator-credits"
 msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2009"
diff --git a/help/es/krb5-auth-dialog.xml b/help/es/krb5-auth-dialog.xml
index f912f6b..931f41f 100644
--- a/help/es/krb5-auth-dialog.xml
+++ b/help/es/krb5-auth-dialog.xml
@@ -144,7 +144,7 @@
     <varlistentry>
       <term>Línea de comandos</term>
       <listitem>
-	<para>Escriba <command>krb5-auth-dialog --always</command> después pulse <keycap>Intro</keycap>:</para>
+	<para>Escriba <command>krb5-auth-dialog</command> y <keycap>Intro</keycap>:</para>
       </listitem>
     </varlistentry>
   </variablelist>
diff --git a/help/sl/krb5-auth-dialog.xml b/help/sl/krb5-auth-dialog.xml
index e6e00d5..8065476 100644
--- a/help/sl/krb5-auth-dialog.xml
+++ b/help/sl/krb5-auth-dialog.xml
@@ -219,14 +219,14 @@
       <term>Command line</term>
       <listitem>
 	<para>
-	  Type <command>krb5-auth-dialog --always</command>,
+	  Type <command>krb5-auth-dialog</command>,
           then press <keycap>Return</keycap>:
         </para>
       </listitem>
     </varlistentry>
   </variablelist>
   <para>
-    The tray icon will indicate one of tree states:
+    The tray icon will indicate one of three states:
   </para>
 
   <section id="trayicon-valid">
diff --git a/help/sv/krb5-auth-dialog.xml b/help/sv/krb5-auth-dialog.xml
index ac0f84f..4622bc9 100644
--- a/help/sv/krb5-auth-dialog.xml
+++ b/help/sv/krb5-auth-dialog.xml
@@ -159,12 +159,15 @@
     <varlistentry>
       <term>Kommandorad</term>
       <listitem>
-	<para>Skriv <command>krb5-auth-dialog --always</command> och tryck sedan på <keycap>Return</keycap>:</para>
+	<para>
+	  Type <command>krb5-auth-dialog</command>,
+          then press <keycap>Return</keycap>:
+        </para>
       </listitem>
     </varlistentry>
   </variablelist>
   <para>
-    The tray icon will indicate one of tree states:
+    The tray icon will indicate one of three states:
   </para>
 
   <section id="trayicon-valid">
diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec
index 65e442e..e8c45f6 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.0
+Version: 3.2.1
 Release: 1
 License: GPL
 Group: User Interface/X
diff --git a/ltmain.sh b/ltmain.sh
index c7dd906..c7bf234 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -69,7 +69,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4 Debian-2.4-3
+#         $progname:	(GNU libtool) 2.4 Debian-2.4-4
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,7 +79,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4 Debian-2.4-3"
+VERSION="2.4 Debian-2.4-4"
 TIMESTAMP=""
 package_revision=1.3293
 
diff --git a/po/cs.po b/po/cs.po
index 27ca180..f55611f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,8 +7,9 @@
 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"
+"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"
 "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"
@@ -19,31 +20,143 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../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 "Certificate and private key used for authentication"
+msgstr "Certifikát a soukromý klíč použitý k autentizaci"
+
+#: ../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ů."
+
+#: ../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."
+
+#: ../src/krb5-auth-dialog.ui.h:4
+msgid "If checked, request forwardable tickets"
+msgstr ""
+
+#: ../src/krb5-auth-dialog.ui.h:5
+msgid "If checked, request proxiable tickets"
+msgstr ""
+
+#: ../src/krb5-auth-dialog.ui.h:6
+msgid "If checked, request renewable tickets"
+msgstr "Pokud je zaškrtnuto, požadovat obnovitelné lístky"
+
+#: ../src/krb5-auth-dialog.ui.h:7
+msgid "If checked, use a security token (Smartcard) to authenticate."
+msgstr ""
+
+#: ../src/krb5-auth-dialog.ui.h:8
+msgid "Kerberos"
+msgstr "Kerberos"
+
+#.
+#. * 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:2
+#: ../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"
+
+#: ../src/krb5-auth-dialog.ui.h:12
+msgid "Kerberos principal:"
+msgstr "Principal:"
+
+#: ../src/krb5-auth-dialog.ui.h:13
+msgid "Notifications"
+msgstr "Upozornění"
+
+#: ../src/krb5-auth-dialog.ui.h:14
+msgid "PKINIT"
+msgstr "PKINIT"
+
+#: ../src/krb5-auth-dialog.ui.h:15
+msgid "Requested Kerberos tickets should be:"
+msgstr "Požadované lístky Kerberos mohou být:"
+
+#: ../src/krb5-auth-dialog.ui.h:16
+msgid ""
+"Send notification about ticket expiry that many minutes before it finally "
+"expires"
+msgstr ""
+
+#: ../src/krb5-auth-dialog.ui.h:17
 msgid "Service Tickets"
 msgstr "Lístky služeb"
 
-#: ../src/krb5-auth-dialog.ui.h:3
+#: ../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."
+
+#: ../src/krb5-auth-dialog.ui.h:19
+msgid "Use Smartcard"
+msgstr "Použít čipovou kartu"
+
+#: ../src/krb5-auth-dialog.ui.h:20
+msgid "Userid"
+msgstr "Id uživatele"
+
+#. Used in combination: 'Warn x minutes before expiry'
+#: ../src/krb5-auth-dialog.ui.h:22
+msgid "Warn"
+msgstr "Upozornit"
+
+#: ../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:25
 msgid "_Edit"
 msgstr "Ú_pravy"
 
-#: ../src/krb5-auth-dialog.ui.h:4
+#: ../src/krb5-auth-dialog.ui.h:26
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../src/krb5-auth-dialog.ui.h:5
+#: ../src/krb5-auth-dialog.ui.h:27
 msgid "_Help"
 msgstr "Nápo_věda"
 
-#: ../src/krb5-auth-dialog.ui.h:6
+#: ../src/krb5-auth-dialog.ui.h:28
 msgid "_Renew Ticket"
 msgstr "_Obnovit lístek"
 
+#: ../src/krb5-auth-dialog.ui.h:29
+msgid "forwardable"
+msgstr ""
+
+#. 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:32
+msgid "proxiable"
+msgstr ""
+
+#: ../src/krb5-auth-dialog.ui.h:33
+msgid "renewable"
+msgstr ""
+
 #: ../src/ka-dialog.c:177
 msgid "unknown error"
 msgstr "neznámá chyba"
@@ -61,8 +174,7 @@ 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:367
+#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:368
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
@@ -70,8 +182,7 @@ 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"
 
-#: ../src/ka-pwdialog.c:222
-#: ../src/ka-applet.c:372
+#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:373
 msgid "Your credentials have expired"
 msgstr "Vaše přihlašovací údaje vypršely"
 
@@ -99,67 +210,67 @@ msgstr "Chyba %s"
 #. first since these are the ones the user will see in any case.
 #: ../src/dummy-strings.c:10
 msgid "ASN.1 failed call to system time library"
-msgstr "ASN.1 - selhalo volání do systémové časové knihovny"
+msgstr "ASN.1 – selhalo volání do systémové časové knihovny"
 
 #. asn1_err.et:asn1:ASN1_BAD_TIMEFORMAT
 #: ../src/dummy-strings.c:11
 msgid "ASN.1 structure is missing a required field"
-msgstr "ASN.1 - chybí požadované pole struktury"
+msgstr "ASN.1 – chybí požadované pole struktury"
 
 #. asn1_err.et:asn1:ASN1_MISSING_FIELD
 #: ../src/dummy-strings.c:12
 msgid "ASN.1 unexpected field number"
-msgstr "ASN.1 - neočekávané číslo pole"
+msgstr "ASN.1 – neočekávané číslo pole"
 
 #. asn1_err.et:asn1:ASN1_MISPLACED_FIELD
 #: ../src/dummy-strings.c:13
 msgid "ASN.1 type numbers are inconsistent"
-msgstr "ASN.1 - čísla typů jsou nekonzistentní"
+msgstr "ASN.1 – čísla typů jsou nekonzistentní"
 
 #. asn1_err.et:asn1:ASN1_TYPE_MISMATCH
 #: ../src/dummy-strings.c:14
 msgid "ASN.1 value too large"
-msgstr "ASN.1 - hodnota je příliš velká"
+msgstr "ASN.1 – hodnota je příliš velká"
 
 #. asn1_err.et:asn1:ASN1_OVERFLOW
 #: ../src/dummy-strings.c:15
 msgid "ASN.1 encoding ended unexpectedly"
-msgstr "ASN.1 - neočekávaný konec kódování"
+msgstr "ASN.1 – neočekávaný konec kódování"
 
 #. asn1_err.et:asn1:ASN1_OVERRUN
 #: ../src/dummy-strings.c:16
 msgid "ASN.1 identifier doesn't match expected value"
-msgstr "ASN.1 - identifikátor neodpovídá očekávané hodnotě"
+msgstr "ASN.1 – identifikátor neodpovídá očekávané hodnotě"
 
 #. asn1_err.et:asn1:ASN1_BAD_ID
 #: ../src/dummy-strings.c:17
 msgid "ASN.1 length doesn't match expected value"
-msgstr "ASN.1 - délka neodpovídá očekávané hodnotě"
+msgstr "ASN.1 – délka neodpovídá očekávané hodnotě"
 
 #. asn1_err.et:asn1:ASN1_BAD_LENGTH
 #: ../src/dummy-strings.c:18
 msgid "ASN.1 badly-formatted encoding"
-msgstr "ASN.1 - nesprávně formátované kódování"
+msgstr "ASN.1 – nesprávně formátované kódování"
 
 #. asn1_err.et:asn1:ASN1_BAD_FORMAT
 #: ../src/dummy-strings.c:19
 msgid "ASN.1 parse error"
-msgstr "ASN.1 - chyba analýzy"
+msgstr "ASN.1 – chyba analýzy"
 
 #. asn1_err.et:asn1:ASN1_PARSE_ERROR
 #: ../src/dummy-strings.c:20
 msgid "ASN.1 bad return from gmtime"
-msgstr "ASN.1 - nesprávná návratová hodnota funkce gmtime"
+msgstr "ASN.1 – nesprávná návratová hodnota funkce gmtime"
 
 #. asn1_err.et:asn1:ASN1_BAD_GMTIME
 #: ../src/dummy-strings.c:21
 msgid "ASN.1 non-constructed indefinite encoding"
-msgstr ""
+msgstr "ASN.1 – kódování nesestavené na dobu neurčitou"
 
 #. asn1_err.et:asn1:ASN1_MISMATCH_INDEF
 #: ../src/dummy-strings.c:22
 msgid "ASN.1 missing expected EOC"
-msgstr "ASN.1 - chybí očekávaný EOC"
+msgstr "ASN.1 – chybí očekávaný EOC"
 
 #. asn1_err.et:asn1:ASN1_MISSING_EOC
 #: ../src/dummy-strings.c:23
@@ -184,12 +295,12 @@ msgstr "Požadovaná verze protokolu není podporována"
 #. krb5_err.et:krb5:KRB5KDC_ERR_BAD_PVNO
 #: ../src/dummy-strings.c:27
 msgid "Client's key is encrypted in an old master key"
-msgstr ""
+msgstr "Klientský klíč je šifrován na starém hlavním klíči"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_C_OLD_MAST_KVNO
 #: ../src/dummy-strings.c:28
 msgid "Server's key is encrypted in an old master key"
-msgstr ""
+msgstr "Serverový klíč je šifrován na starém hlavním klíči"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_S_OLD_MAST_KVNO
 #: ../src/dummy-strings.c:29
@@ -209,7 +320,7 @@ msgstr "Principal má v databázi Kerberos více záznamů"
 #. krb5_err.et:krb5:KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE
 #: ../src/dummy-strings.c:32
 msgid "Client or server has a null key"
-msgstr ""
+msgstr "Klient nebo server mají prázdný klíč"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_NULL_KEY
 #: ../src/dummy-strings.c:33
@@ -244,12 +355,12 @@ msgstr "KDC nepodporuje tento typ kontrolního součtu"
 #. krb5_err.et:krb5:KRB5KDC_ERR_SUMTYPE_NOSUPP
 #: ../src/dummy-strings.c:39
 msgid "KDC has no support for padata type"
-msgstr ""
+msgstr "KDC nemá podporu pro datový typ padata"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_PADATA_TYPE_NOSUPP
 #: ../src/dummy-strings.c:40
 msgid "KDC has no support for transited type"
-msgstr ""
+msgstr "KDC nemá podporu pro datový typ transited"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_TRTYPE_NOSUPP
 #: ../src/dummy-strings.c:41
@@ -354,7 +465,7 @@ msgstr "Neplatný typ zprávy"
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_MSG_TYPE
 #: ../src/dummy-strings.c:61
 msgid "Message stream modified"
-msgstr ""
+msgstr "Proud zpráv byl změněn"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_MODIFIED
 #: ../src/dummy-strings.c:62
@@ -378,15 +489,14 @@ msgstr "Klíč služby není k dispozici"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOKEY
 #. krb5_err.et:krb5:KRB5_NO_LOCALNAME
-#: ../src/dummy-strings.c:66
-#: ../src/dummy-strings.c:122
+#: ../src/dummy-strings.c:66 ../src/dummy-strings.c:122
 msgid "Mutual authentication failed"
 msgstr "Vzájemná autentizace selhala"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_MUT_FAIL
 #: ../src/dummy-strings.c:67
 msgid "Incorrect message direction"
-msgstr ""
+msgstr "Nesprávný směr zprávy"
 
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADDIRECTION
 #: ../src/dummy-strings.c:68
@@ -486,7 +596,7 @@ msgstr "Nesouhlasí jméno KDC"
 #. krb5_err.et:krb5:KRB5KDC_ERR_KDC_NAME_MISMATCH
 #: ../src/dummy-strings.c:87
 msgid "Inconsistent key purpose"
-msgstr ""
+msgstr "Nekonzistentní účel klíče"
 
 #. krb5_err.et:krb5:KRB5KDC_ERR_INCONSISTENT_KEY_PURPOSE
 #: ../src/dummy-strings.c:88
@@ -516,7 +626,7 @@ msgstr "$Id: krb5_err.et 19934 2007-09-13 23:49:00Z tlyu $"
 #. krb5_err.et:krb5:KRB5_ERR_RCSID
 #: ../src/dummy-strings.c:93
 msgid "Invalid flag for file lock mode"
-msgstr ""
+msgstr "Neplatný příznak pro režim zamykání souboru"
 
 #. krb5_err.et:krb5:KRB5_LIBOS_BADLOCKFLAG
 #: ../src/dummy-strings.c:94
@@ -531,12 +641,12 @@ msgstr "Heslo nesouhlasí"
 #. krb5_err.et:krb5:KRB5_LIBOS_BADPWDMATCH
 #: ../src/dummy-strings.c:96
 msgid "Password read interrupted"
-msgstr ""
+msgstr "Čtení hesla bylo přerušeno"
 
 #. krb5_err.et:krb5:KRB5_LIBOS_PWDINTR
 #: ../src/dummy-strings.c:97
 msgid "Illegal character in component name"
-msgstr ""
+msgstr "Neplatný znak v názvu komponenty"
 
 #. krb5_err.et:krb5:KRB5_PARSE_ILLCHAR
 #: ../src/dummy-strings.c:98
@@ -551,12 +661,12 @@ msgstr "Nelze najít/otevřít konfigurační soubor Kerberos"
 #. krb5_err.et:krb5:KRB5_CONFIG_CANTOPEN
 #: ../src/dummy-strings.c:100
 msgid "Improper format of Kerberos configuration file"
-msgstr ""
+msgstr "Nesprávný formát souboru s nastavením Kerberos"
 
 #. krb5_err.et:krb5:KRB5_CONFIG_BADFORMAT
 #: ../src/dummy-strings.c:101
 msgid "Insufficient space to return complete information"
-msgstr ""
+msgstr "Nedostatek místa pro vrácení úplné informace"
 
 #. krb5_err.et:krb5:KRB5_CONFIG_NOTENUFSPACE
 #: ../src/dummy-strings.c:102
@@ -631,7 +741,7 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_PROG_KEYTYPE_NOSUPP
 #: ../src/dummy-strings.c:116
 msgid "Requested encryption type not used in message"
-msgstr ""
+msgstr "Ve zprávě nebyl použit požadovaný typ šifrování"
 
 #. krb5_err.et:krb5:KRB5_WRONG_ETYPE
 #: ../src/dummy-strings.c:117
@@ -991,7 +1101,7 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_CONFIG_NODEFREALM
 #: ../src/dummy-strings.c:189
 msgid "Bad SAM flags in obtain_sam_padata"
-msgstr ""
+msgstr "Špatné příznaky SAM v obtain_sam_padata"
 
 #. krb5_err.et:krb5:KRB5_SAM_UNSUPPORTED
 #: ../src/dummy-strings.c:190
@@ -1021,12 +1131,12 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_KT_KVNONOTFOUND
 #: ../src/dummy-strings.c:195
 msgid "This application has expired"
-msgstr ""
+msgstr "Této aplikaci vypršela platnost"
 
 #. krb5_err.et:krb5:KRB5_APPL_EXPIRED
 #: ../src/dummy-strings.c:196
 msgid "This Krb5 library has expired"
-msgstr ""
+msgstr "Této knihovně Krb5 vypršela platnost"
 
 #. krb5_err.et:krb5:KRB5_LIB_EXPIRED
 #: ../src/dummy-strings.c:197
@@ -1086,7 +1196,7 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5_ERR_NUMERIC_REALM
 #: ../src/dummy-strings.c:208
 msgid "Invalid key generation parameters from KDC"
-msgstr ""
+msgstr "Neplatné parametry z KDC pro generování klíče"
 
 #. krb5_err.et:krb5:KRB5_ERR_BAD_S2K_PARAMS
 #: ../src/dummy-strings.c:209
@@ -1126,336 +1236,330 @@ msgstr ""
 #. kv5m_err.et:kv5m:KV5M_NONE
 #: ../src/dummy-strings.c:216
 msgid "Bad magic number for krb5_principal structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_principal structure"
 
 #. kv5m_err.et:kv5m:KV5M_PRINCIPAL
 #: ../src/dummy-strings.c:217
 msgid "Bad magic number for krb5_data structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_data structure"
 
 #. kv5m_err.et:kv5m:KV5M_DATA
 #: ../src/dummy-strings.c:218
 msgid "Bad magic number for krb5_keyblock structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_keyblock structure"
 
 #. kv5m_err.et:kv5m:KV5M_KEYBLOCK
 #: ../src/dummy-strings.c:219
 msgid "Bad magic number for krb5_checksum structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_checksum structure"
 
 #. kv5m_err.et:kv5m:KV5M_CHECKSUM
 #: ../src/dummy-strings.c:220
 msgid "Bad magic number for krb5_encrypt_block structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_encrypt_block structure"
 
 #. kv5m_err.et:kv5m:KV5M_ENCRYPT_BLOCK
 #: ../src/dummy-strings.c:221
 msgid "Bad magic number for krb5_enc_data structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_enc_data structure"
 
 #. kv5m_err.et:kv5m:KV5M_ENC_DATA
 #: ../src/dummy-strings.c:222
 msgid "Bad magic number for krb5_cryptosystem_entry structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_cryptosystem_entry structure"
 
 #. kv5m_err.et:kv5m:KV5M_CRYPTOSYSTEM_ENTRY
 #: ../src/dummy-strings.c:223
 msgid "Bad magic number for krb5_cs_table_entry structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_cs_table_entry structure"
 
 #. kv5m_err.et:kv5m:KV5M_CS_TABLE_ENTRY
 #: ../src/dummy-strings.c:224
 msgid "Bad magic number for krb5_checksum_entry structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_checksum_entry structure"
 
 #. kv5m_err.et:kv5m:KV5M_CHECKSUM_ENTRY
 #: ../src/dummy-strings.c:225
 msgid "Bad magic number for krb5_authdata structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_authdata structure"
 
 #. kv5m_err.et:kv5m:KV5M_AUTHDATA
 #: ../src/dummy-strings.c:226
 msgid "Bad magic number for krb5_transited structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_transited structure"
 
 #. kv5m_err.et:kv5m:KV5M_TRANSITED
 #: ../src/dummy-strings.c:227
 msgid "Bad magic number for krb5_enc_tkt_part structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_enc_tkt_part structure"
 
 #. kv5m_err.et:kv5m:KV5M_ENC_TKT_PART
 #: ../src/dummy-strings.c:228
 msgid "Bad magic number for krb5_ticket structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_ticket structure"
 
 #. kv5m_err.et:kv5m:KV5M_TICKET
 #: ../src/dummy-strings.c:229
 msgid "Bad magic number for krb5_authenticator structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_authenticator structure"
 
 #. kv5m_err.et:kv5m:KV5M_AUTHENTICATOR
 #: ../src/dummy-strings.c:230
 msgid "Bad magic number for krb5_tkt_authent structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_tkt_authent structure"
 
 #. kv5m_err.et:kv5m:KV5M_TKT_AUTHENT
 #: ../src/dummy-strings.c:231
 msgid "Bad magic number for krb5_creds structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_creds structure"
 
 #. kv5m_err.et:kv5m:KV5M_CREDS
 #: ../src/dummy-strings.c:232
 msgid "Bad magic number for krb5_last_req_entry structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_last_req_entry structure"
 
 #. kv5m_err.et:kv5m:KV5M_LAST_REQ_ENTRY
 #: ../src/dummy-strings.c:233
 msgid "Bad magic number for krb5_pa_data structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_pa_data structure"
 
 #. kv5m_err.et:kv5m:KV5M_PA_DATA
 #: ../src/dummy-strings.c:234
 msgid "Bad magic number for krb5_kdc_req structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_kdc_req structure"
 
 #. kv5m_err.et:kv5m:KV5M_KDC_REQ
 #: ../src/dummy-strings.c:235
 msgid "Bad magic number for krb5_enc_kdc_rep_part structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_enc_kdc_rep_part structure"
 
 #. kv5m_err.et:kv5m:KV5M_ENC_KDC_REP_PART
 #: ../src/dummy-strings.c:236
 msgid "Bad magic number for krb5_kdc_rep structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_kdc_rep structure"
 
 #. kv5m_err.et:kv5m:KV5M_KDC_REP
 #: ../src/dummy-strings.c:237
 msgid "Bad magic number for krb5_error structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_error structure"
 
 #. kv5m_err.et:kv5m:KV5M_ERROR
 #: ../src/dummy-strings.c:238
 msgid "Bad magic number for krb5_ap_req structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_ap_req structure"
 
 #. kv5m_err.et:kv5m:KV5M_AP_REQ
 #: ../src/dummy-strings.c:239
 msgid "Bad magic number for krb5_ap_rep structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_ap_rep structure"
 
 #. kv5m_err.et:kv5m:KV5M_AP_REP
 #: ../src/dummy-strings.c:240
 msgid "Bad magic number for krb5_ap_rep_enc_part structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_ap_rep_enc_part structure"
 
 #. kv5m_err.et:kv5m:KV5M_AP_REP_ENC_PART
 #: ../src/dummy-strings.c:241
 msgid "Bad magic number for krb5_response structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_response structure"
 
 #. kv5m_err.et:kv5m:KV5M_RESPONSE
 #: ../src/dummy-strings.c:242
 msgid "Bad magic number for krb5_safe structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_safe structure"
 
 #. kv5m_err.et:kv5m:KV5M_SAFE
 #: ../src/dummy-strings.c:243
 msgid "Bad magic number for krb5_priv structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_priv structure"
 
 #. kv5m_err.et:kv5m:KV5M_PRIV
 #: ../src/dummy-strings.c:244
 msgid "Bad magic number for krb5_priv_enc_part structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_priv_enc_part structure"
 
 #. kv5m_err.et:kv5m:KV5M_PRIV_ENC_PART
 #: ../src/dummy-strings.c:245
 msgid "Bad magic number for krb5_cred structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_cred structure"
 
 #. kv5m_err.et:kv5m:KV5M_CRED
 #: ../src/dummy-strings.c:246
 msgid "Bad magic number for krb5_cred_info structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_cred_info structure"
 
 #. kv5m_err.et:kv5m:KV5M_CRED_INFO
 #: ../src/dummy-strings.c:247
 msgid "Bad magic number for krb5_cred_enc_part structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_cred_enc_part structure"
 
 #. kv5m_err.et:kv5m:KV5M_CRED_ENC_PART
 #: ../src/dummy-strings.c:248
 msgid "Bad magic number for krb5_pwd_data structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_pwd_data structure"
 
 #. kv5m_err.et:kv5m:KV5M_PWD_DATA
 #: ../src/dummy-strings.c:249
 msgid "Bad magic number for krb5_address structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_address structure"
 
 #. kv5m_err.et:kv5m:KV5M_ADDRESS
 #: ../src/dummy-strings.c:250
 msgid "Bad magic number for krb5_keytab_entry structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_keytab_entry structure"
 
 #. kv5m_err.et:kv5m:KV5M_KEYTAB_ENTRY
 #: ../src/dummy-strings.c:251
 msgid "Bad magic number for krb5_context structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_context structure"
 
 #. kv5m_err.et:kv5m:KV5M_CONTEXT
 #: ../src/dummy-strings.c:252
 msgid "Bad magic number for krb5_os_context structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_os_context structure"
 
 #. kv5m_err.et:kv5m:KV5M_OS_CONTEXT
 #: ../src/dummy-strings.c:253
 msgid "Bad magic number for krb5_alt_method structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_alt_method structure"
 
 #. kv5m_err.et:kv5m:KV5M_ALT_METHOD
 #: ../src/dummy-strings.c:254
 msgid "Bad magic number for krb5_etype_info_entry structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_etype_info_entry structure"
 
 #. kv5m_err.et:kv5m:KV5M_ETYPE_INFO_ENTRY
 #: ../src/dummy-strings.c:255
 msgid "Bad magic number for krb5_db_context structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_db_context structure"
 
 #. kv5m_err.et:kv5m:KV5M_DB_CONTEXT
 #: ../src/dummy-strings.c:256
 msgid "Bad magic number for krb5_auth_context structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_auth_context structure"
 
 #. kv5m_err.et:kv5m:KV5M_AUTH_CONTEXT
 #: ../src/dummy-strings.c:257
 msgid "Bad magic number for krb5_keytab structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_keytab structure"
 
 #. kv5m_err.et:kv5m:KV5M_KEYTAB
 #: ../src/dummy-strings.c:258
 msgid "Bad magic number for krb5_rcache structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_rcache structure"
 
 #. kv5m_err.et:kv5m:KV5M_RCACHE
 #: ../src/dummy-strings.c:259
 msgid "Bad magic number for krb5_ccache structure"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_ccache structure"
 
 #. kv5m_err.et:kv5m:KV5M_CCACHE
 #: ../src/dummy-strings.c:260
 msgid "Bad magic number for krb5_preauth_ops"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_preauth_ops"
 
 #. kv5m_err.et:kv5m:KV5M_PREAUTH_OPS
 #: ../src/dummy-strings.c:261
 msgid "Bad magic number for krb5_sam_challenge"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_sam_challenge"
 
 #. kv5m_err.et:kv5m:KV5M_SAM_CHALLENGE
 #: ../src/dummy-strings.c:262
 msgid "Bad magic number for krb5_sam_challenge_2"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_sam_challenge_2"
 
 #. kv5m_err.et:kv5m:KV5M_SAM_CHALLENGE_2
 #: ../src/dummy-strings.c:263
 msgid "Bad magic number for krb5_sam_key"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_sam_key"
 
 #. kv5m_err.et:kv5m:KV5M_SAM_KEY
 #. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC
-#: ../src/dummy-strings.c:264
-#: ../src/dummy-strings.c:265
+#: ../src/dummy-strings.c:264 ../src/dummy-strings.c:265
 msgid "Bad magic number for krb5_enc_sam_response_enc"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_enc_sam_response_enc"
 
 #. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC_2
 #: ../src/dummy-strings.c:266
 msgid "Bad magic number for krb5_sam_response"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_sam_response"
 
 #. kv5m_err.et:kv5m:KV5M_SAM_RESPONSE
 #: ../src/dummy-strings.c:267
 msgid "Bad magic number for krb5_sam_response 2"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_sam_response 2"
 
 #. kv5m_err.et:kv5m:KV5M_SAM_RESPONSE_2
 #: ../src/dummy-strings.c:268
 msgid "Bad magic number for krb5_predicted_sam_response"
-msgstr ""
+msgstr "Špatné magické číslo pro krb5_predicted_sam_response"
 
 #. kv5m_err.et:kv5m:KV5M_PREDICTED_SAM_RESPONSE
 #: ../src/dummy-strings.c:269
 msgid "Bad magic number for passwd_phrase_element"
-msgstr ""
+msgstr "Špatné magické číslo pro passwd_phrase_element"
 
 #. kv5m_err.et:kv5m:KV5M_PASSWD_PHRASE_ELEMENT
 #: ../src/dummy-strings.c:270
 msgid "Bad magic number for GSSAPI OID"
-msgstr ""
+msgstr "Špatné magické číslo pro GSSAPI OID"
 
 #. kv5m_err.et:kv5m:KV5M_GSS_OID
 #: ../src/dummy-strings.c:271
 msgid "Bad magic number for GSSAPI QUEUE"
-msgstr ""
+msgstr "Špatné magické číslo pro GSSAPI QUEUE"
 
-#: ../src/ka-applet.c:361
+#: ../src/ka-applet.c:362
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "Vaše přihlašovací údaje vyprší za %.2d:%.2dh"
 
-#: ../src/ka-applet.c:543
+#: ../src/ka-applet.c:544
 msgid "List Tickets"
 msgstr "Lístky služeb"
 
-#: ../src/ka-applet.c:553
+#: ../src/ka-applet.c:554
 msgid "Get Ticket"
 msgstr "Získat lístek"
 
-#: ../src/ka-applet.c:562
+#: ../src/ka-applet.c:563
 msgid "Don't show me this again"
 msgstr "Znovu nezobrazovat"
 
-#: ../src/ka-applet.c:569
+#: ../src/ka-applet.c:570
 msgid "Remove Credentials Cache"
 msgstr "Odstranit mezipaměť přihlašovacích údajů"
 
-#: ../src/ka-applet.c:618
+#: ../src/ka-applet.c:619
 msgid "You have valid Kerberos credentials."
 msgstr "Vaše přihlašovací údaje jsou platné."
 
-#: ../src/ka-applet.c:620
+#: ../src/ka-applet.c:621
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Aktualizovali jste své přihlašovací údaje."
 
-#: ../src/ka-applet.c:623
+#: ../src/ka-applet.c:624
 msgid "Network credentials valid"
 msgstr "Síťové přihlašovací údaje jsou platné"
 
-#: ../src/ka-applet.c:642
+#: ../src/ka-applet.c:643
 msgid "Network credentials expiring"
 msgstr "Blíží se konec platnosti síťových přihlašovacích údajů"
 
-#: ../src/ka-applet.c:660
+#: ../src/ka-applet.c:661
 msgid "Network credentials expired"
 msgstr "Platnost síťových přihlašovacích údajů vypršela"
 
-#: ../src/ka-applet.c:661
+#: ../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:705
-#, c-format
-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 "
-
-#: ../src/ka-applet.c:775
+#: ../src/ka-applet.c:741
 msgid "Remove Credentials _Cache"
 msgstr "Odstranit mezipaměť přihlašova_cích údajů"
 
 #. Ticket dialog
-#: ../src/ka-applet.c:785
+#: ../src/ka-applet.c:751
 msgid "_List Tickets"
 msgstr "_Lístky služeb"
 
@@ -1473,34 +1577,46 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Zdeněk Hataš <zdenek.hatas@gmail.com>"
 
-#: ../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 "Začátek platnosti"
 
-#: ../src/ka-main-window.c:130
+#: ../src/ka-main-window.c:131
 msgid "End Time"
 msgstr "Konec platnosti"
 
-#: ../src/ka-main-window.c:136
+#: ../src/ka-main-window.c:137
 msgid "Fwd"
 msgstr "Předat"
 
-#: ../src/ka-main-window.c:142
+#: ../src/ka-main-window.c:143
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/ka-main-window.c:148
+#: ../src/ka-main-window.c:149
 msgid "Renew"
 msgstr "Obnovit"
 
-#: ../src/ka-main-window.c:175
+#: ../src/ka-main-window.c:176
 msgid "Error displaying service ticket information"
 msgstr "Chyba zobrazení informací o lístku služby"
 
+#: ../src/ka-preferences.c:340
+msgid "Choose Certificate"
+msgstr "Vyberte certifikát"
+
+#: ../src/ka-preferences.c:356
+msgid "X509 Certificates"
+msgstr "Certifikáty X.509"
+
+#: ../src/ka-preferences.c:360
+msgid "all files"
+msgstr "všechny soubory"
+
 #: ../src/krb5-auth-dialog.desktop.in.h:2
 msgid "Kerberos Network Authentication Dialog"
 msgstr "Dialog síťové autentizace Kerberos"
@@ -1570,7 +1686,8 @@ msgid "Requested tickets should be renewable"
 msgstr "Požadované lístky by měly být obnovitelné"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:17
-msgid "Start prompting/displaying notifications that many minutes before expiry"
+msgid ""
+"Start prompting/displaying notifications that many minutes before expiry"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:18
@@ -1598,125 +1715,11 @@ msgstr ""
 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"
 
-#. 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;Autentizace"
-
-#: ../cc-panel/gnome-ka-panel.desktop.in.h:4
-msgid "Set your Kerberos network authentication preferences"
-msgstr "Nastavte své předvolby síťové autentizace Kerberos"
+#~ 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 "
 
-#: ../cc-panel/ka-panel.ui.h:1
-msgid "Certificate and private key used for authentication"
-msgstr "Certifikát a soukromý klíč použitý k autentizaci"
-
-#: ../cc-panel/ka-panel.ui.h:2
-msgid "Certificate used to verify digital signatures."
-msgstr "Certifikát použitý pro ověření digitálních podpisů."
-
-#: ../cc-panel/ka-panel.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."
-
-#: ../cc-panel/ka-panel.ui.h:4
-msgid "If checked, request forwardable tickets"
-msgstr ""
-
-#: ../cc-panel/ka-panel.ui.h:5
-msgid "If checked, request proxiable tickets"
-msgstr ""
+#~ msgid "Kerberos;Authentication"
+#~ msgstr "Kerberos;Autentizace"
 
-#: ../cc-panel/ka-panel.ui.h:6
-msgid "If checked, request renewable tickets"
-msgstr "Pokud je zaškrtnuto, požadovat obnovitelné lístky"
-
-#: ../cc-panel/ka-panel.ui.h:7
-msgid "If checked, use a security token (Smartcard) to authenticate."
-msgstr ""
-
-#: ../cc-panel/ka-panel.ui.h:8
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:9
-msgid "Kerberos Ticket Options"
-msgstr "Vlastnosti lístku Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:10
-msgid "Kerberos User"
-msgstr "Uživatel"
-
-#: ../cc-panel/ka-panel.ui.h:11
-msgid "Kerberos principal:"
-msgstr "Principal:"
-
-#: ../cc-panel/ka-panel.ui.h:12
-msgid "Notifications"
-msgstr "Upozornění"
-
-#: ../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 "Požadované lístky Kerberos mohou být:"
-
-#: ../cc-panel/ka-panel.ui.h:15
-msgid "Send notification about ticket expiry that many minutes before it finally expires"
-msgstr ""
-
-#: ../cc-panel/ka-panel.ui.h:16
-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."
-
-#: ../cc-panel/ka-panel.ui.h:17
-msgid "Use Smartcard"
-msgstr "Použít čipovou kartu"
-
-#: ../cc-panel/ka-panel.ui.h:18
-msgid "Userid"
-msgstr "Id uživatele"
-
-#. Used in combination: 'Warn x minutes before expiry'
-#: ../cc-panel/ka-panel.ui.h:20
-msgid "Warn"
-msgstr "Upozornit"
-
-#: ../cc-panel/ka-panel.ui.h:21
-msgid "X509 trust anchors"
-msgstr ""
-
-#: ../cc-panel/ka-panel.ui.h:22
-msgid "_Browse..."
-msgstr "_Procházet..."
-
-#: ../cc-panel/ka-panel.ui.h:23
-msgid "forwardable"
-msgstr ""
-
-#. Used in combination: 'Warn x minutes before expiry'
-#: ../cc-panel/ka-panel.ui.h:25
-msgid "minutes before ticket expiry"
-msgstr "minut do vypršení lístku"
-
-#: ../cc-panel/ka-panel.ui.h:26
-msgid "proxiable"
-msgstr ""
-
-#: ../cc-panel/ka-panel.ui.h:27
-msgid "renewable"
-msgstr ""
-
-#: ../cc-panel/cc-ka-panel.c:345
-msgid "Choose Certificate"
-msgstr "Vyberte certifikát"
-
-#: ../cc-panel/cc-ka-panel.c:361
-msgid "X509 Certificates"
-msgstr "Certifikáty X.509"
-
-#: ../cc-panel/cc-ka-panel.c:365
-msgid "all files"
-msgstr "všechny soubory"
+#~ msgid "Set your Kerberos network authentication preferences"
+#~ msgstr "Nastavte své předvolby síťové autentizace Kerberos"
diff --git a/po/fr.po b/po/fr.po
index ea301e0..6dc0ca5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@ 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-03-30 13:43+0000\n"
-"PO-Revision-Date: 2011-04-21 17:35+0200\n"
+"POT-Creation-Date: 2011-09-06 10:36+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"
 "MIME-Version: 1.0\n"
@@ -20,19 +20,148 @@ msgstr ""
 "Content-Transfer-Encoding: 8 bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/krb5-auth-dialog.ui.h:1 ../src/krb5-auth-dialog.desktop.in.h:1
-#: ../cc-panel/gnome-ka-panel.desktop.in.h:1
+#: ../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"
+
+#: ../src/krb5-auth-dialog.ui.h:2
+msgid "Certificate used to verify digital signatures."
+msgstr "Certificat utilisé pour vérifier les signatures numériques."
+
+#: ../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."
+
+#: ../src/krb5-auth-dialog.ui.h:4
+msgid "If checked, request forwardable tickets"
+msgstr "Si coché, demande des tickets transférables"
+
+#: ../src/krb5-auth-dialog.ui.h:5
+msgid "If checked, request proxiable tickets"
+msgstr "Si coché, demande des tickets utilisables via proxy"
+
+#: ../src/krb5-auth-dialog.ui.h:6
+msgid "If checked, request renewable tickets"
+msgstr "Si coché, demande des tickets renouvelables"
+
+#: ../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."
+
+#: ../src/krb5-auth-dialog.ui.h:8
+msgid "Kerberos"
+msgstr "Kerberos"
+
+#.
+#. * 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:2
+#: ../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"
+
+#: ../src/krb5-auth-dialog.ui.h:12
+msgid "Kerberos principal:"
+msgstr "Principal Kerberos :"
+
+#: ../src/krb5-auth-dialog.ui.h:13
+msgid "Notifications"
+msgstr "Notifications"
+
+#: ../src/krb5-auth-dialog.ui.h:14
+msgid "PKINIT"
+msgstr "PKINIT"
+
+#: ../src/krb5-auth-dialog.ui.h:15
+msgid "Requested Kerberos tickets should be:"
+msgstr "Les tickets Kerberos demandés doivent être :"
+
+#: ../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"
+
+#: ../src/krb5-auth-dialog.ui.h:17
 msgid "Service Tickets"
 msgstr "Tickets de service"
 
-#: ../src/krb5-auth-dialog.ui.h:3
+#: ../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."
+
+#: ../src/krb5-auth-dialog.ui.h:19
+msgid "Use Smartcard"
+msgstr "Utiliser une carte à puce"
+
+#: ../src/krb5-auth-dialog.ui.h:20
+msgid "Userid"
+msgstr "Identifiant"
+
+#. Used in combination: 'Warn x minutes before expiry'
+#: ../src/krb5-auth-dialog.ui.h:22
+msgid "Warn"
+msgstr "Avertir"
+
+#: ../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:25
+msgid "_Edit"
+msgstr "É_dition"
+
+#: ../src/krb5-auth-dialog.ui.h:26
+msgid "_File"
+msgstr "_Fichier"
+
+#: ../src/krb5-auth-dialog.ui.h:27
+msgid "_Help"
+msgstr "Aid_e"
+
+#: ../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"
+
+#. 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:32
+msgid "proxiable"
+msgstr "utilisables via proxy"
+
+#: ../src/krb5-auth-dialog.ui.h:33
+msgid "renewable"
+msgstr "renouvelables"
+
 #: ../src/ka-dialog.c:177
 msgid "unknown error"
 msgstr "erreur inconnue"
@@ -50,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:361
+#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:368
 #, 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:366
+#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:373
 msgid "Your credentials have expired"
 msgstr "Vos informations d'authentification ont expiré."
 
@@ -1406,71 +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:355
+#: ../src/ka-applet.c:362
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "Vos informations d'authentification expirent dans %.2d h %.2d"
 
-#: ../src/ka-applet.c:537
+#: ../src/ka-applet.c:544
 msgid "List Tickets"
 msgstr "Énumérer les tickets"
 
-#: ../src/ka-applet.c:547
+#: ../src/ka-applet.c:554
 msgid "Get Ticket"
 msgstr "Obtenir le ticket"
 
-#: ../src/ka-applet.c:556
+#: ../src/ka-applet.c:563
 msgid "Don't show me this again"
 msgstr "Ne plus afficher"
 
-#: ../src/ka-applet.c:563
+#: ../src/ka-applet.c:570
 msgid "Remove Credentials Cache"
 msgstr "Supprimer le cache des informations d'authentification"
 
-#: ../src/ka-applet.c:612
+#: ../src/ka-applet.c:619
 msgid "You have valid Kerberos credentials."
 msgstr "Vos informations d'authentification Kerberos sont valides."
 
-#: ../src/ka-applet.c:614
+#: ../src/ka-applet.c:621
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Vous avez actualisé vos informations d'authentification Kerberos."
 
-#: ../src/ka-applet.c:617
+#: ../src/ka-applet.c:624
 msgid "Network credentials valid"
 msgstr "Informations d'authentification réseau valides"
 
-#: ../src/ka-applet.c:636
+#: ../src/ka-applet.c:643
 msgid "Network credentials expiring"
 msgstr "Informations d'authentification Kerberos en cours d'expiration"
 
-#: ../src/ka-applet.c:654
+#: ../src/ka-applet.c:661
 msgid "Network credentials expired"
 msgstr "Informations d'authentification réseau expirées"
 
-#: ../src/ka-applet.c:655
+#: ../src/ka-applet.c:662
 msgid "Your Kerberos credentails have expired."
 msgstr "Vos informations d'authentification Kerberos ont expiré."
 
-#: ../src/ka-applet.c:699
-#, c-format
-msgid "There was an error launching the preferences dialog: %s"
-msgstr ""
-"Une erreur est survenue lors de l'ouverture de la boîte de dialogue des "
-"préférences : %s"
-
-#. Translators: add the translators of your language here
-#: ../src/ka-applet.c:745
-msgid "translator-credits"
-msgstr ""
-"Laurent Coudeur <laurentc@iol.ie>\n"
-"Claude Paroz <claude@2xlibre.net>"
-
-#: ../src/ka-applet.c:790
+#: ../src/ka-applet.c:741
 msgid "Remove Credentials _Cache"
 msgstr "Supprimer le _cache des informations d'authentification"
 
 #. Ticket dialog
-#: ../src/ka-applet.c:800
+#: ../src/ka-applet.c:751
 msgid "_List Tickets"
 msgstr "É_numérer les tickets"
 
@@ -1483,34 +1598,53 @@ msgstr ""
 "Une erreur est survenue lors de l'affichage de l'aide :\n"
 "%s"
 
-#: ../src/ka-tickets.c:56
+#. Translators: add the translators of your language here
+#: ../src/ka-tools.c:83
+msgid "translator-credits"
+msgstr ""
+"Laurent Coudeur <laurentc@iol.ie>\n"
+"Claude Paroz <claude@2xlibre.net>"
+
+#: ../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 "Heure de début"
 
-#: ../src/ka-tickets.c:68
+#: ../src/ka-main-window.c:131
 msgid "End Time"
 msgstr "Heure de fin"
 
-#: ../src/ka-tickets.c:74
+#: ../src/ka-main-window.c:137
 msgid "Fwd"
 msgstr "Transfert"
 
-#: ../src/ka-tickets.c:80
+#: ../src/ka-main-window.c:143
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/ka-tickets.c:86
+#: ../src/ka-main-window.c:149
 msgid "Renew"
 msgstr "Renouvellement"
 
-#: ../src/ka-tickets.c:109
+#: ../src/ka-main-window.c:176
 msgid "Error displaying service ticket information"
 msgstr "Erreur lors de l'affichage des informations du ticket de service"
 
+#: ../src/ka-preferences.c:340
+msgid "Choose Certificate"
+msgstr "Choix d'un certificat"
+
+#: ../src/ka-preferences.c:356
+msgid "X509 Certificates"
+msgstr "Certificats X509"
+
+#: ../src/ka-preferences.c:360
+msgid "all files"
+msgstr "tous les fichiers"
+
 #: ../src/krb5-auth-dialog.desktop.in.h:2
 msgid "Kerberos Network Authentication Dialog"
 msgstr "Boîte de dialogue d'authentification réseau Kerberos"
@@ -1612,138 +1746,3 @@ msgstr "Notification de ticket valide"
 #, c-format
 msgid "Warning: running q-agent setuid on this system is dangerous\n"
 msgstr "Avertissement : exécuter q-agent setuid sur ce système est dangereux\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 "Authentification;Kerberos"
-
-#: ../cc-panel/gnome-ka-panel.desktop.in.h:4
-msgid "Set your Kerberos network authentication preferences"
-msgstr "Définir vos préférences de l'authentification réseau Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:1
-msgid "Certificate and private key used for authentication"
-msgstr "Certificat et clé privée utilisés pour l'authentification"
-
-#: ../cc-panel/ka-panel.ui.h:2
-msgid "Certificate used to verify digital signatures."
-msgstr "Certificat utilisé pour vérifier les signatures numériques."
-
-#: ../cc-panel/ka-panel.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." 
-
-#: ../cc-panel/ka-panel.ui.h:4
-msgid "If checked, request forwardable tickets"
-msgstr "Si coché, demande des tickets transférables"
-
-#: ../cc-panel/ka-panel.ui.h:5
-msgid "If checked, request proxiable tickets"
-msgstr "Si coché, demande des tickets utilisables via proxy"
-
-#: ../cc-panel/ka-panel.ui.h:6
-msgid "If checked, request renewable tickets"
-msgstr "Si coché, demande des tickets renouvelables"
-
-#: ../cc-panel/ka-panel.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."
-
-#: ../cc-panel/ka-panel.ui.h:8
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:9
-msgid "Kerberos Ticket Options"
-msgstr "Options des tickets Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:10
-msgid "Kerberos User"
-msgstr "Utilisateur Kerberos"
-
-#: ../cc-panel/ka-panel.ui.h:11
-msgid "Kerberos principal:"
-msgstr "Principal Kerberos :"
-
-#: ../cc-panel/ka-panel.ui.h:12
-msgid "Notifications"
-msgstr "Notifications"
-
-#: ../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 "Les tickets Kerberos demandés doivent être :"
-
-#: ../cc-panel/ka-panel.ui.h:15
-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"
-
-#: ../cc-panel/ka-panel.ui.h:16
-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."
-
-#: ../cc-panel/ka-panel.ui.h:17
-msgid "Use Smartcard"
-msgstr "Utiliser une carte à puce"
-
-#: ../cc-panel/ka-panel.ui.h:18
-msgid "Userid"
-msgstr "Identifiant"
-
-#. Used in combination: 'Warn x minutes before expiry'
-#: ../cc-panel/ka-panel.ui.h:20
-msgid "Warn"
-msgstr "Avertir"
-
-#: ../cc-panel/ka-panel.ui.h:21
-msgid "X509 trust anchors"
-msgstr "Ancrages de confiance X509"
-
-#: ../cc-panel/ka-panel.ui.h:22
-msgid "_Browse..."
-msgstr "_Parcourir..."
-
-#: ../cc-panel/ka-panel.ui.h:23
-msgid "forwardable"
-msgstr "transférables"
-
-#. Used in combination: 'Warn x minutes before expiry'
-#: ../cc-panel/ka-panel.ui.h:25
-msgid "minutes before ticket expiry"
-msgstr "minutes avant l'expiration du ticket"
-
-#: ../cc-panel/ka-panel.ui.h:26
-msgid "proxiable"
-msgstr "utilisables via proxy"
-
-#: ../cc-panel/ka-panel.ui.h:27
-msgid "renewable"
-msgstr "renouvelables"
-
-#: ../cc-panel/cc-ka-panel.c:345
-msgid "Choose Certificate"
-msgstr "Choix d'un certificat"
-
-#: ../cc-panel/cc-ka-panel.c:361
-msgid "X509 Certificates"
-msgstr "Certificats X509"
-
-#: ../cc-panel/cc-ka-panel.c:365
-msgid "all files"
-msgstr "tous les fichiers"
diff --git a/src/ka-applet.c b/src/ka-applet.c
index f1fffbf..56d4b14 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -188,10 +188,6 @@ ka_applet_startup (GApplication *application)
     KA_DEBUG ("Primary application");
 
     self->priv->startup_ccache = ka_kerberos_init (self);
-    if (!ka_dbus_connect (self)) {
-        ka_applet_destroy (self);
-    }
-
     main_window = ka_main_window_create (self, self->priv->uixml);
     gtk_application_add_window (GTK_APPLICATION(self), main_window);
     ka_preferences_window_create (self, self->priv->uixml);
@@ -1080,6 +1076,8 @@ ka_applet_create ()
     applet->priv->loader = ka_plugin_loader_create (applet);
     g_return_val_if_fail (applet->priv->loader != NULL, NULL);
 
+    g_return_val_if_fail (ka_dbus_connect (applet), NULL);
+
     return applet;
 }
 
diff --git a/src/ka-dbus.c b/src/ka-dbus.c
index 2b84adc..c88561e 100644
--- a/src/ka-dbus.c
+++ b/src/ka-dbus.c
@@ -169,15 +169,11 @@ static const GDBusInterfaceVTable interface_vtable =
 };
 
 
-static void
-ka_dbus_on_get_bus_cb (GObject *source_object G_GNUC_UNUSED,
-                       GAsyncResult *res,
-                       gpointer      user_data)
+static gboolean
+ka_dbus_register (KaApplet *applet)
 {
-    KaApplet *applet = user_data;
     guint id;
 
-    dbus_connection = g_bus_get_finish (res, NULL);
     introspection_data = g_dbus_node_info_new_for_xml (
         ka_dbus_introspection_xml,
         NULL);
@@ -189,9 +185,10 @@ ka_dbus_on_get_bus_cb (GObject *source_object G_GNUC_UNUSED,
                                         applet,
                                         NULL,  /* user_data_free_func */
                                         NULL); /* GError** */
-    if (!id)
-        g_error ("Failed to register DBus object");
+
+    g_return_val_if_fail(id, FALSE);
     ka_dbus_connect_signals (applet);
+    return TRUE;
 }
 
 
@@ -212,9 +209,10 @@ ka_dbus_connect (KaApplet *applet)
 {
     g_return_val_if_fail (applet != 0, FALSE);
 
-    g_bus_get (G_BUS_TYPE_SESSION, NULL, ka_dbus_on_get_bus_cb,
-               applet);
-    return TRUE;
+    dbus_connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
+    g_return_val_if_fail (dbus_connection != NULL, FALSE);
+
+    return ka_dbus_register(applet);
 }
 
 /*
diff --git a/src/krb5-auth-dialog.desktop.in b/src/krb5-auth-dialog.desktop.in
index 6f02571..7c2223a 100644
--- a/src/krb5-auth-dialog.desktop.in
+++ b/src/krb5-auth-dialog.desktop.in
@@ -5,6 +5,7 @@ Exec=krb5-auth-dialog
 Terminal=false
 Type=Application
 Icon=krb-valid-ticket
+Categories=GNOME;GTK;Utility;Network;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=krb5-auth-dialog
 X-GNOME-Bugzilla-Component=general