Merge commit 'upstream/3.0.0'

4 files changed, 356 insertions, 345 deletions

diff --git a/po/de.po b/po/de.po
index 10e0506..3a09f5e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,17 +11,17 @@
 # dem Client und Server und verifiziert selbst deren Identität.
 #
 # Guido Günther <agx@sigxcpu.org>, 2009.
-# Mario Blättermann <mariobl@gnome.org>, 2009, 2010.
+# Mario Blättermann <mariobl@freenet.de>, 2009-2011.
 # Christian Kirbach  <Christian.Kirbach@googlemail.com>, 2009, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: krb5-auth-dialog master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-"
-"auth-dialog&component=general\n"
-"POT-Creation-Date: 2010-10-05 13:11+0000\n"
-"PO-Revision-Date: 2010-10-06 21:11+0100\n"
-"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
+"auth-dialog&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-03-30 13:43+0000\n"
+"PO-Revision-Date: 2011-03-31 22:34+0100\n"
+"Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,57 +30,61 @@ msgstr ""
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\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 "Netzwerkanmeldung"
+#: ../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 "Kerberos-Legitimierung"
 
-#: ../src/krb5-auth-dialog.xml.h:2
+#: ../src/krb5-auth-dialog.ui.h:2
 msgid "Service Tickets"
 msgstr "Service-Tickets"
 
-#: ../src/krb5-auth-dialog.xml.h:3
+#: ../src/krb5-auth-dialog.ui.h:3
 msgid "_Renew Ticket"
 msgstr "Ticket _erneuern"
 
-#: ../src/ka-dialog.c:172
+#: ../src/ka-dialog.c:177
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../src/ka-dialog.c:333
+#: ../src/ka-dialog.c:317
+msgid "Your ticket cache is currently empty"
+msgstr "Ihr Ticket-Zwischenspeicher ist gegenwärtig leer"
+
+#: ../src/ka-dialog.c:343
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: ../src/ka-pwdialog.c:174
+#: ../src/ka-pwdialog.c:178
 #, c-format
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr "Kerberos-Ticket konnte nicht erlangt werden: »%s«"
 
-#: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:375
+#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:361
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
 msgstr[0] "Ihre Anmeldeinformationen laufen in %d Minute ab"
 msgstr[1] "Ihre Anmeldeinformationen laufen in %d Minuten ab"
 
-#: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:380
+#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:366
 msgid "Your credentials have expired"
 msgstr "Anmeldeinformationen abgelaufen"
 
-#: ../src/ka-pwdialog.c:237
+#: ../src/ka-pwdialog.c:245
 msgid "Please enter your Kerberos password:"
 msgstr "Bitte geben Sie ihr Kerberos-Passwort ein:"
 
-#: ../src/ka-pwdialog.c:248
+#: ../src/ka-pwdialog.c:258
 #, c-format
 msgid "Please enter the password for '%s':"
 msgstr "Bitte geben Sie das Passwort für »%s« ein:"
 
-#: ../src/ka-pwdialog.c:268
+#: ../src/ka-pwdialog.c:276
 msgid "The password you entered is invalid"
 msgstr "Das eingegebene Passwort ist nicht gültig"
 
-#: ../src/ka-pwdialog.c:284
+#: ../src/ka-pwdialog.c:292
 #, c-format
 msgid "%s Error"
 msgstr "%s-Fehler"
@@ -1430,67 +1434,70 @@ msgstr "Falsche magische Zahl für GSSAPI OID"
 msgid "Bad magic number for GSSAPI QUEUE"
 msgstr "Falsche magische Zahl für GSSAPI QUEUE"
 
-#: ../src/ka-applet.c:369
+#: ../src/ka-applet.c:355
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "Anmeldeinformationen laufen in %.2d:%.2dh ab."
 
-#: ../src/ka-applet.c:500
-msgid "Don't show me this again"
-msgstr "Dies nicht mehr anzeigen"
+#: ../src/ka-applet.c:537
+msgid "List Tickets"
+msgstr "Tickets auflisten"
 
-#: ../src/ka-applet.c:507
+#: ../src/ka-applet.c:547
 msgid "Get Ticket"
 msgstr "Ticket holen"
 
-#: ../src/ka-applet.c:551
-msgid "Network credentials valid"
-msgstr "Anmeldeinformationen sind gültig"
+#: ../src/ka-applet.c:556
+msgid "Don't show me this again"
+msgstr "Dies nicht mehr anzeigen"
 
-#: ../src/ka-applet.c:552
+#: ../src/ka-applet.c:563
+msgid "Remove Credentials Cache"
+msgstr "Zwischenspeicher für Anmeldeinformationen löschen"
+
+#: ../src/ka-applet.c:612
+msgid "You have valid Kerberos credentials."
+msgstr "Sie verfügen über gültige Kerberos-Anmeldeinformationen."
+
+#: ../src/ka-applet.c:614
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Sie haben Ihre Kerberos-Anmeldeinformationen erneuert."
 
-#: ../src/ka-applet.c:568
+#: ../src/ka-applet.c:617
+msgid "Network credentials valid"
+msgstr "Anmeldeinformationen sind gültig"
+
+#: ../src/ka-applet.c:636
 msgid "Network credentials expiring"
 msgstr "Anmeldeinformationen laufen ab"
 
-#: ../src/ka-applet.c:586
+#: ../src/ka-applet.c:654
 msgid "Network credentials expired"
 msgstr "Anmeldeinformationen abgelaufen"
 
-#: ../src/ka-applet.c:587
+#: ../src/ka-applet.c:655
 msgid "Your Kerberos credentails have expired."
 msgstr "Ihre Kerberos-Anmeldeinformationen sind abgelaufen."
 
-#: ../src/ka-applet.c:631
+#: ../src/ka-applet.c:699
 #, c-format
 msgid "There was an error launching the preferences dialog: %s"
 msgstr "Fehler beim Öffnen des Einstellungsdialogs: %s"
 
-#: ../src/ka-applet.c:671
-#, c-format
-msgid ""
-"There was an error displaying %s:\n"
-"%s"
-msgstr ""
-"Fehler beim Anzeigen von %s:\n"
-"%s"
-
 #. Translators: add the translators of your language here
-#: ../src/ka-applet.c:708
+#: ../src/ka-applet.c:745
 msgid "translator-credits"
 msgstr ""
 "Guido Günther <agx@sigxcpu.org>\n"
-"Mario Blättermann <mariobl@gnome.org>\n"
+"Mario Blättermann <mariobl@freenet.de>\n"
 "Christian Kirbach <Christian.Kirbach@googlemail.com>"
 
-#: ../src/ka-applet.c:753
+#: ../src/ka-applet.c:790
 msgid "Remove Credentials _Cache"
 msgstr "_Anmeldeinformationen löschen"
 
 #. Ticket dialog
-#: ../src/ka-applet.c:763
+#: ../src/ka-applet.c:800
 msgid "_List Tickets"
 msgstr "Tickets auf_listen"
 
@@ -1503,35 +1510,35 @@ msgstr ""
 "Fehler beim Anzeigen der Hilfe:\n"
 "%s"
 
-#: ../src/ka-tickets.c:54
+#: ../src/ka-tickets.c:56
 msgid "Principal"
 msgstr "Principal"
 
-#: ../src/ka-tickets.c:60
+#: ../src/ka-tickets.c:62
 msgid "Start Time"
 msgstr "Startzeit"
 
-#: ../src/ka-tickets.c:66
+#: ../src/ka-tickets.c:68
 msgid "End Time"
 msgstr "Endzeit"
 
-#: ../src/ka-tickets.c:72
+#: ../src/ka-tickets.c:74
 msgid "Fwd"
 msgstr "Weiterleiten"
 
-#: ../src/ka-tickets.c:78
+#: ../src/ka-tickets.c:80
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/ka-tickets.c:84
+#: ../src/ka-tickets.c:86
 msgid "Renew"
 msgstr "Erneuern"
 
-#: ../src/ka-tickets.c:107
+#: ../src/ka-tickets.c:109
 msgid "Error displaying service ticket information"
 msgstr "Fehler beim Anzeigen der Informationen des Tickets des Dienstes"
 
-#: ../src/krb5-auth-dialog.desktop.in.h:1
+#: ../src/krb5-auth-dialog.desktop.in.h:2
 msgid "Kerberos Network Authentication Dialog"
 msgstr "Kerberos Netzwerkanmeldungsdialog"
 
@@ -1602,35 +1609,27 @@ msgid "Requested tickets should be renewable"
 msgstr "Angeforderte Tickets sollten erneuerbar sein"
 
 #: ../src/krb5-auth-dialog.schemas.in.h:17
-msgid "Show a trayicon in the status area of the panel"
-msgstr "Ein Symbol im Benachrichtigungsfeld des Panels anzeigen"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:18
-msgid "Show trayicon"
-msgstr "Benachrichtigungssymbol anzeigen"
-
-#: ../src/krb5-auth-dialog.schemas.in.h:19
 msgid "Start prompting/displaying notifications that many minutes before expiry"
 msgstr "So viele Minuten vor Ablauf benachrichtigen/anzeigen"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:20
+#: ../src/krb5-auth-dialog.schemas.in.h:18
 msgid "The kerberos principal to acquire the ticket for"
 msgstr "Der Kerberos-Principal, für den das Ticket erlangt werden soll"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:21
+#: ../src/krb5-auth-dialog.schemas.in.h:19
 msgid "The principal's public/private/certificate identifier when using PKINIT"
 msgstr ""
 "Die öffentliche/private/Zertifikatsbezeichnung bei Verwendung von PKINIT"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:22
+#: ../src/krb5-auth-dialog.schemas.in.h:20
 msgid "ticket expired notification"
 msgstr "Benachrichtigung über abgelaufenes Ticket"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:23
+#: ../src/krb5-auth-dialog.schemas.in.h:21
 msgid "ticket expiring notification"
 msgstr "Benachrichtigung über bald ablaufendes Ticket"
 
-#: ../src/krb5-auth-dialog.schemas.in.h:24
+#: ../src/krb5-auth-dialog.schemas.in.h:22
 msgid "valid ticket notification"
 msgstr "Benachrichtigung über gültiges Ticket"
 
@@ -1641,85 +1640,78 @@ msgstr ""
 "Warnung: q-agent mit Admistratorrechten auszuführen ist auf diesem System "
 "gefährlich\n"
 
-#: ../preferences/ka-preferences.c:345
-msgid "Choose Certificate"
-msgstr "Zertifikat wählen"
-
-#: ../preferences/ka-preferences.c:361
-msgid "X509 Certificates"
-msgstr "X509-Zertifikate"
-
-#: ../preferences/ka-preferences.c:365
-msgid "all files"
-msgstr "Alle Dateien"
+#. 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;Legitimierung"
 
-#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:2
+#: ../cc-panel/gnome-ka-panel.desktop.in.h:4
 msgid "Set your Kerberos network authentication preferences"
 msgstr "Einstellungen für Kerberos-Netzwerkanmeldung"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:1
-msgid "Appearance"
-msgstr "Erscheinungsbild"
-
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:2
-msgid "Applet"
-msgstr "Applet"
-
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:3
+#: ../cc-panel/ka-panel.ui.h:1
 msgid "Certificate and private key used for authentication"
 msgstr "Zertifikat und geheimer Schlüssel zur Identifizierung"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:4
-msgid "If checked, display the tray icon in the status bar"
-msgstr "Legt fest, ob ein Symbol im Benachrichtigungsfeld anzeigt wird"
+#: ../cc-panel/ka-panel.ui.h:2
+msgid "Certificate used to verify digital signatures."
+msgstr "Zur Überprüfung der digitalen Signaturen verwendetes Zertifikat."
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:5
+#: ../cc-panel/ka-panel.ui.h:3
+msgid ""
+"Configure the use of certificates and smartcards for your Kerberos network "
+"authentication."
+msgstr ""
+"Konfigurieren Sie die Nutzung von Zertifikaten und Smartcards für Ihre "
+"Kerberos-Netzwerklegitimierung."
+
+#: ../cc-panel/ka-panel.ui.h:4
 msgid "If checked, request forwardable tickets"
 msgstr "Legt fest, ob weiterleitbare Tickets angefordert werden sollen"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:6
+#: ../cc-panel/ka-panel.ui.h:5
 msgid "If checked, request proxiable tickets"
 msgstr "Legt fest, ob Proxy-fähige Tickets angefordert werden sollen"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:7
+#: ../cc-panel/ka-panel.ui.h:6
 msgid "If checked, request renewable tickets"
 msgstr "Legt fest, ob erneuerbare Tickets angefordert werden sollen"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:8
+#: ../cc-panel/ka-panel.ui.h:7
 msgid "If checked, use a security token (Smartcard) to authenticate."
 msgstr ""
 "Legt fest, ob ein Sicherheits-Token (Smartcard) zur Identifizierung verwendet "
 "wird"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:9
+#: ../cc-panel/ka-panel.ui.h:8
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:10
-msgid "Kerberos Authentication Configuration"
-msgstr "Konfiguration für Kerberos-Legitimierung"
+#: ../cc-panel/ka-panel.ui.h:9
+msgid "Kerberos Ticket Options"
+msgstr "Optionen zum Kerberos-Ticket "
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:11
+#: ../cc-panel/ka-panel.ui.h:10
 msgid "Kerberos User"
 msgstr "Kerberos-Benutzer"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:12
+#: ../cc-panel/ka-panel.ui.h:11
 msgid "Kerberos principal:"
 msgstr "Kerberos-Principal:"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:13
+#: ../cc-panel/ka-panel.ui.h:12
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:14
-msgid "PKINIT:"
-msgstr "PKINIT:"
+#: ../cc-panel/ka-panel.ui.h:13
+msgid "PKINIT"
+msgstr "PKINIT"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:15
+#: ../cc-panel/ka-panel.ui.h:14
 msgid "Requested Kerberos tickets should be:"
 msgstr "Angeforderte Kerberos-Tickets sollen sein:"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:16
+#: ../cc-panel/ka-panel.ui.h:15
 msgid ""
 "Send notification about ticket expiry that many minutes before it finally "
 "expires"
@@ -1727,58 +1719,60 @@ msgstr ""
 "So viele Minuten vor endgültigem Ablauf des Tickets eine Benachrichtigung "
 "senden"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:17
-msgid "Show tray icon"
-msgstr "Benachrichtigungssymbol anzeigen"
-
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:18
-msgid "Ticket Options"
-msgstr "Optionen zum Ticket "
+#: ../cc-panel/ka-panel.ui.h:16
+msgid ""
+"The name of your Kerberos account. Leave blank to use your current username."
+msgstr ""
+"Der Name Ihres Kerberos-Kontos. Leer lassen, um Ihren aktuellen Benutzernamen "
+"zu verwenden."
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:19
+#: ../cc-panel/ka-panel.ui.h:17
 msgid "Use Smartcard"
 msgstr "Smartcard verwenden"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:20
-msgid "Userid:"
-msgstr "Benutzerkennung:"
+#: ../cc-panel/ka-panel.ui.h:18
+msgid "Userid"
+msgstr "Benutzerkennung"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:22
+#: ../cc-panel/ka-panel.ui.h:20
 msgid "Warn"
 msgstr "Warnen"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:23
-msgid "X509 trust anchors:"
-msgstr "X509 Vertrauensinstitution:"
+#: ../cc-panel/ka-panel.ui.h:21
+msgid "X509 trust anchors"
+msgstr "X509 Vertrauensinstitutionen"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:24
+#: ../cc-panel/ka-panel.ui.h:22
 msgid "_Browse..."
 msgstr "_Auswählen …"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:25
+#: ../cc-panel/ka-panel.ui.h:23
 msgid "forwardable"
 msgstr "weiterleitbar"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:27
-msgid "minutes before expiry"
-msgstr "Minuten vor Ablauf"
+#: ../cc-panel/ka-panel.ui.h:25
+msgid "minutes before ticket expiry"
+msgstr "Minuten vor Ablauf des Tickets"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:28
+#: ../cc-panel/ka-panel.ui.h:26
 msgid "proxiable"
 msgstr "als Proxy nutzbar"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:29
+#: ../cc-panel/ka-panel.ui.h:27
 msgid "renewable"
 msgstr "erneuerbar"
 
-#~ msgid "PKINIT anchors:"
-#~ msgstr "PKINIT Anker:"
+#: ../cc-panel/cc-ka-panel.c:345
+msgid "Choose Certificate"
+msgstr "Zertifikat wählen"
+
+#: ../cc-panel/cc-ka-panel.c:361
+msgid "X509 Certificates"
+msgstr "X509-Zertifikate"
+
+#: ../cc-panel/cc-ka-panel.c:365
+msgid "all files"
+msgstr "Alle Dateien"
 
-#~ msgid ""
-#~ "The principal's public/private/certificate identifier. Leave empty if not "
-#~ "using PKINIT."
-#~ msgstr ""
-#~ "Öffentliche/private/zertifikats Identifikation. Leer lassen, wenn kein "
-#~ "PKINT benutzt wird."
diff --git a/po/es.po b/po/es.po
index fc4db6f..3a8484d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,8 +10,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-23 14:05+0000\n"
-"PO-Revision-Date: 2011-03-24 10:48+0100\n"
+"POT-Creation-Date: 2011-03-26 07:43+0000\n"
+"PO-Revision-Date: 2011-03-28 13:29+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"
@@ -37,7 +37,11 @@ msgstr "_Renovar tique"
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: ../src/ka-dialog.c:335
+#: ../src/ka-dialog.c:317
+msgid "Your ticket cache is currently empty"
+msgstr "Su caché de tiques está vacía actualmente"
+
+#: ../src/ka-dialog.c:343
 msgid "Expired"
 msgstr "Caducado"
 
@@ -1428,12 +1432,10 @@ msgid "You've refreshed your Kerberos credentials."
 msgstr "Ha actualizado sus credenciales de Kerberos."
 
 #: ../src/ka-applet.c:613
-#| msgid "Network credentials expired"
 msgid "Network credentials valid"
 msgstr "Credenciales de red válidas"
 
 #: ../src/ka-applet.c:632
-#| msgid "Network credentials expired"
 msgid "Network credentials expiring"
 msgstr "Las credenciales de red van a caducar"
 
@@ -1665,7 +1667,6 @@ msgid "Notifications"
 msgstr "Notificaciones"
 
 #: ../cc-panel/ka-panel.ui.h:13
-#| msgid "PKINIT:"
 msgid "PKINIT"
 msgstr "PKINIT"
 
@@ -1693,7 +1694,6 @@ msgid "Use Smartcard"
 msgstr "Usar tarjeta inteligente"
 
 #: ../cc-panel/ka-panel.ui.h:18
-#| msgid "Userid:"
 msgid "Userid"
 msgstr "ID de usuario"
 
@@ -1703,7 +1703,6 @@ msgid "Warn"
 msgstr "Advertir"
 
 #: ../cc-panel/ka-panel.ui.h:21
-#| msgid "X509 trust anchors:"
 msgid "X509 trust anchors"
 msgstr "Anclas de confianza de X509"
 
diff --git a/po/nb.po b/po/nb.po
index 8010b9c..38e86a7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,80 +3,85 @@
 # Copyright (C) 2005 Red Hat, Inc.
 # This file is distributed under the same license as the krb5-auth-dialog package.
 #
-# Kjartan Maraas <kmaraas@gnome.org>, 2005-2007.
+# Kjartan Maraas <kmaraas@gnome.org>, 2005-2011.
 # Petter Reinholdtsen <pere@hungry.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-21 09:43+0200\n"
-"PO-Revision-Date: 2010-07-25 01:08MET\n"
-"Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
+"POT-Creation-Date: 2011-03-28 20:36+0200\n"
+"PO-Revision-Date: 2011-03-28 20:39+0200\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../src/krb5-auth-dialog.xml.h:1 ../src/krb5-auth-dialog.desktop.in.h:2
-#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:1
-msgid "Network Authentication"
-msgstr "Nettverksautentisering"
+#: ../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 "Kerberos-autentisering"
 
-#: ../src/krb5-auth-dialog.xml.h:2
+#: ../src/krb5-auth-dialog.ui.h:2
 msgid "Service Tickets"
 msgstr "Tjenestebilletter"
 
-#: ../src/krb5-auth-dialog.xml.h:3
+#: ../src/krb5-auth-dialog.ui.h:3
 msgid "_Renew Ticket"
 msgstr "Fo_rny billett"
 
-#: ../src/ka-dialog.c:172
+#: ../src/ka-dialog.c:177
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: ../src/ka-dialog.c:332
+#: ../src/ka-dialog.c:317
+msgid "Your ticket cache is currently empty"
+msgstr ""
+
+#: ../src/ka-dialog.c:343
 msgid "Expired"
 msgstr "Utgått"
 
-#: ../src/ka-pwdialog.c:174
+#: ../src/ka-pwdialog.c:178
 #, c-format
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr "Fikk ikke tak i kerberosbillett: '%s'"
 
-#: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:390
+#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:361
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
 msgstr[0] "Påloggingsinformasjonen utløper om %d minutt"
 msgstr[1] "Påloggingsinformasjonen utløper om %d minutter"
 
-#: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:395
+#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:366
 msgid "Your credentials have expired"
 msgstr "Påloggingsinformasjonen har gått ut"
 
-#: ../src/ka-pwdialog.c:237
+#: ../src/ka-pwdialog.c:245
 msgid "Please enter your Kerberos password:"
 msgstr "Vennligst skriv inn ditt Kerberos-passord:"
 
-#: ../src/ka-pwdialog.c:248
+#: ../src/ka-pwdialog.c:258
 #, c-format
 msgid "Please enter the password for '%s':"
 msgstr "Vennligst oppgi passord for «%s»:"
 
-#: ../src/ka-pwdialog.c:268
+#: ../src/ka-pwdialog.c:276
 msgid "The password you entered is invalid"
 msgstr "Passordet du oppga er ugyldig"
 
-#: ../src/ka-pwdialog.c:284
+#: ../src/ka-pwdialog.c:292
 #, c-format
 msgid "%s Error"
 msgstr "%s-Feil"
 
 #. Translators: files from dummy-strings.c are *all* possible errors
 #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in
-#. doubt please translate strings from files starting with krb5-auth
+#. doubt please translate strings from files starting with ka- and krb5-auth-
 #. first since these are the ones the user will see in any case.
 #: ../src/dummy-strings.c:10
 msgid "ASN.1 failed call to system time library"
@@ -1379,94 +1384,104 @@ msgstr ""
 msgid "Bad magic number for GSSAPI QUEUE"
 msgstr ""
 
-#. Translators: First number is hours, second number is minutes
-#: ../src/ka-applet.c:386
+#: ../src/ka-applet.c:355
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
-msgstr "Fine fullmakter utgår om %.2d:%.2dt"
+msgstr "Dine fullmakter utgår om %.2d:%.2dt"
+
+#: ../src/ka-applet.c:537
+msgid "List Tickets"
+msgstr "Vis billetter"
+
+#: ../src/ka-applet.c:547
+msgid "Get Ticket"
+msgstr "Vis billetter"
 
-#: ../src/ka-applet.c:491
+#: ../src/ka-applet.c:556
 msgid "Don't show me this again"
 msgstr "Ikke vis meg dette igjen"
 
-#: ../src/ka-applet.c:533
-msgid "Network credentials valid"
-msgstr "Nettverksfullmakter er gyldige"
+#: ../src/ka-applet.c:563
+msgid "Remove Credentials Cache"
+msgstr "Fjern fullmaktsmellomlager"
 
-#: ../src/ka-applet.c:534
+#: ../src/ka-applet.c:611
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Du har fornyhet dine kerberosfullmakter"
 
-#: ../src/ka-applet.c:550
+#: ../src/ka-applet.c:613
+msgid "Network credentials valid"
+msgstr "Nettverksfullmakter er gyldige"
+
+#: ../src/ka-applet.c:632
 msgid "Network credentials expiring"
 msgstr "Nettverksfullmaktene går ut"
 
-#: ../src/ka-applet.c:569
+#: ../src/ka-applet.c:650
 msgid "Network credentials expired"
 msgstr "Nettverksfullmaktene har gått ut"
 
-#: ../src/ka-applet.c:570
+#: ../src/ka-applet.c:651
 msgid "Your Kerberos credentails have expired."
 msgstr "Dine kerberosfullmakter har gått ut."
 
-#: ../src/ka-applet.c:615
+#: ../src/ka-applet.c:694
 #, c-format
 msgid "There was an error launching the preferences dialog: %s"
-msgstr ""
-
-#: ../src/ka-applet.c:656
-#, c-format
-msgid ""
-"There was an error displaying %s:\n"
-"%s"
-msgstr ""
+msgstr "Det oppsto en feil ved oppstart av brukervalgdialogen: %s"
 
 #. Translators: add the translators of your language here
-#: ../src/ka-applet.c:692
+#: ../src/ka-applet.c:740
 msgid "translator-credits"
 msgstr "Petter Reinholdtsen <pere@hungry.com>, 2010"
 
-#. kdestroy
-#: ../src/ka-applet.c:734
+#: ../src/ka-applet.c:785
 msgid "Remove Credentials _Cache"
 msgstr "Fjern fullmakts_mellomlager"
 
+#. Ticket dialog
+#: ../src/ka-applet.c:795
+msgid "_List Tickets"
+msgstr "_Vis billetter"
+
 #: ../src/ka-tools.c:45
 #, c-format
 msgid ""
 "There was an error displaying help:\n"
 "%s"
 msgstr ""
+"Det oppsto en feil ved visning av hjelp:\n"
+"%s"
 
-#: ../src/ka-tickets.c:54
+#: ../src/ka-tickets.c:56
 msgid "Principal"
 msgstr ""
 
-#: ../src/ka-tickets.c:60
+#: ../src/ka-tickets.c:62
 msgid "Start Time"
 msgstr "Starttid"
 
-#: ../src/ka-tickets.c:66
+#: ../src/ka-tickets.c:68
 msgid "End Time"
 msgstr "Sluttid"
 
-#: ../src/ka-tickets.c:72
+#: ../src/ka-tickets.c:73
 msgid "Fwd"
 msgstr "Videresendt"
 
-#: ../src/ka-tickets.c:78
+#: ../src/ka-tickets.c:79
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
-#: ../src/ka-tickets.c:84
+#: ../src/ka-tickets.c:85
 msgid "Renew"
 msgstr "Forny"
 
-#: ../src/ka-tickets.c:107
+#: ../src/ka-tickets.c:109
 msgid "Error displaying service ticket information"
 msgstr ""
 
-#: ../src/krb5-auth-dialog.desktop.in.h:1
+#: ../src/krb5-auth-dialog.desktop.in.h:2
 msgid "Kerberos Network Authentication Dialog"
 msgstr "Dialog for nettverksautentisering via Kerberos"
 
@@ -1535,34 +1550,27 @@ msgid "Requested tickets should be renewable"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:17
-msgid "Show a trayicon in the status area of the panel"
+msgid ""
+"Start prompting/displaying notifications that many minutes before expiry"
 msgstr ""
 
 #: ../src/krb5-auth-dialog.schemas.in.h:18
-msgid "Show trayicon"
-msgstr ""
-
-#: ../src/krb5-auth-dialog.schemas.in.h:19
-msgid "Start prompting/displaying notifications that many minutes before expiry"
-msgstr ""
-
-#: ../src/krb5-auth-dialog.schemas.in.h:20
 msgid "The kerberos principal to acquire the ticket for"
 msgstr ""
 
-#: ../src/krb5-auth-dialog.schemas.in.h:21
+#: ../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:22
+#: ../src/krb5-auth-dialog.schemas.in.h:20
 msgid "ticket expired notification"
 msgstr ""
 
-#: ../src/krb5-auth-dialog.schemas.in.h:23
+#: ../src/krb5-auth-dialog.schemas.in.h:21
 msgid "ticket expiring notification"
 msgstr ""
 
-#: ../src/krb5-auth-dialog.schemas.in.h:24
+#: ../src/krb5-auth-dialog.schemas.in.h:22
 msgid "valid ticket notification"
 msgstr ""
 
@@ -1571,136 +1579,132 @@ msgstr ""
 msgid "Warning: running q-agent setuid on this system is dangerous\n"
 msgstr ""
 
-#: ../preferences/ka-preferences.c:345
-msgid "Choose Certificate"
-msgstr "Velg sertifikat"
-
-#: ../preferences/ka-preferences.c:361
-msgid "X509 Certificates"
-msgstr "X509-sertifikater"
+#. Translators: those are keywords for the example control-center panel
+#: ../cc-panel/gnome-ka-panel.desktop.in.h:3
+msgid "Kerberos;Authentication"
+msgstr "Kerberos;Autentisering"
 
-#: ../preferences/ka-preferences.c:365
-msgid "all files"
-msgstr "alle filer"
-
-#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:2
+#: ../cc-panel/gnome-ka-panel.desktop.in.h:4
 msgid "Set your Kerberos network authentication preferences"
-msgstr ""
-
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:1
-msgid "Appearance"
-msgstr "Utseende"
+msgstr "Sett brukervalg for autentisering over nettverket med Kerberos"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:2
-msgid "Applet"
+#: ../cc-panel/ka-panel.ui.h:1
+msgid "Certificate and private key used for authentication"
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:3
-msgid "Certificate and private key used for authentication"
+#: ../cc-panel/ka-panel.ui.h:2
+msgid "Certificate used to verify digital signatures."
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:4
-msgid "If checked, display the tray icon in the status bar"
+#: ../cc-panel/ka-panel.ui.h:3
+msgid ""
+"Configure the use of certificates and smartcards for your Kerberos network "
+"authentication."
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:5
+#: ../cc-panel/ka-panel.ui.h:4
 msgid "If checked, request forwardable tickets"
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:6
+#: ../cc-panel/ka-panel.ui.h:5
 msgid "If checked, request proxiable tickets"
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:7
+#: ../cc-panel/ka-panel.ui.h:6
 msgid "If checked, request renewable tickets"
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:8
+#: ../cc-panel/ka-panel.ui.h:7
 msgid "If checked, use a security token (Smartcard) to authenticate."
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:9
+#: ../cc-panel/ka-panel.ui.h:8
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:10
-msgid "Kerberos Authentication Configuration"
-msgstr ""
+#: ../cc-panel/ka-panel.ui.h:9
+#, fuzzy
+msgid "Kerberos Ticket Options"
+msgstr "Billettvalg"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:11
+#: ../cc-panel/ka-panel.ui.h:10
 msgid "Kerberos User"
 msgstr "Kerberosbruker"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:12
+#: ../cc-panel/ka-panel.ui.h:11
 msgid "Kerberos principal:"
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:13
+#: ../cc-panel/ka-panel.ui.h:12
 msgid "Notifications"
 msgstr "Varsler"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:14
-msgid "PKINIT:"
-msgstr "PKINIT:"
+#: ../cc-panel/ka-panel.ui.h:13
+msgid "PKINIT"
+msgstr "PKINIT"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:15
+#: ../cc-panel/ka-panel.ui.h:14
 msgid "Requested Kerberos tickets should be:"
 msgstr "Forespurte kerberosbilletter bør være:"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:16
+#: ../cc-panel/ka-panel.ui.h:15
 msgid ""
 "Send notification about ticket expiry that many minutes before it finally "
 "expires"
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:17
-msgid "Show tray icon"
+#: ../cc-panel/ka-panel.ui.h:16
+msgid ""
+"The name of your Kerberos account. Leave blank to use your current username."
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:18
-msgid "Ticket Options"
-msgstr "Billettvalg"
-
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:19
+#: ../cc-panel/ka-panel.ui.h:17
 msgid "Use Smartcard"
 msgstr "Bruk smartkort"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:20
-msgid "Userid:"
-msgstr "Brukerid:"
+#: ../cc-panel/ka-panel.ui.h:18
+msgid "Userid"
+msgstr "Brukerid"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:22
+#: ../cc-panel/ka-panel.ui.h:20
 msgid "Warn"
 msgstr "Varsle"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:23
-msgid "X509 trust anchors:"
+#: ../cc-panel/ka-panel.ui.h:21
+msgid "X509 trust anchors"
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:24
+#: ../cc-panel/ka-panel.ui.h:22
 msgid "_Browse..."
-msgstr ""
+msgstr "_Bla gjennom …"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:25
+#: ../cc-panel/ka-panel.ui.h:23
 msgid "forwardable"
 msgstr "videresendbar"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:27
-msgid "minutes before expiry"
+#: ../cc-panel/ka-panel.ui.h:25
+#, fuzzy
+msgid "minutes before ticket expiry"
 msgstr "minutter før utgåelsen"
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:28
+#: ../cc-panel/ka-panel.ui.h:26
 msgid "proxiable"
 msgstr ""
 
-#: ../preferences/krb5-auth-dialog-preferences.xml.h:29
+#: ../cc-panel/ka-panel.ui.h:27
 msgid "renewable"
 msgstr "fornybar"
 
-msgid "PKINIT anchors:"
-msgstr "PKINIT Anker:"
+#: ../cc-panel/cc-ka-panel.c:345
+msgid "Choose Certificate"
+msgstr "Velg sertifikat"
 
-msgid "_List Tickets"
-msgstr "_Vis billetter"
+#: ../cc-panel/cc-ka-panel.c:361
+msgid "X509 Certificates"
+msgstr "X509-sertifikater"
+
+#: ../cc-panel/cc-ka-panel.c:365
+msgid "all files"
+msgstr "alle filer"
diff --git a/po/sl.po b/po/sl.po
index 187e632..8dc973a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,9 +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&component=general\n"
-"POT-Creation-Date: 2011-02-15 21:16+0000\n"
-"PO-Revision-Date: 2011-02-18 13:16+0100\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-27 20:16+0000\n"
+"PO-Revision-Date: 2011-03-28 08:41+0100\n"
 "Last-Translator: Andrej Žnidaršič <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: \n"
@@ -21,35 +21,39 @@ msgstr ""
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../src/krb5-auth-dialog.xml.h:1
+#: ../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 "Overitev Kerberos"
 
-#: ../src/krb5-auth-dialog.xml.h:2
+#: ../src/krb5-auth-dialog.ui.h:2
 msgid "Service Tickets"
 msgstr "Storitvene vstopnice"
 
-#: ../src/krb5-auth-dialog.xml.h:3
+#: ../src/krb5-auth-dialog.ui.h:3
 msgid "_Renew Ticket"
 msgstr "_Obnovi vstopnico"
 
-#: ../src/ka-dialog.c:171
+#: ../src/ka-dialog.c:177
 msgid "unknown error"
 msgstr "neznana napaka"
 
-#: ../src/ka-dialog.c:332
+#: ../src/ka-dialog.c:317
+msgid "Your ticket cache is currently empty"
+msgstr "Vaš predpomnilnik vozovnic je trenutno prazen"
+
+#: ../src/ka-dialog.c:343
 msgid "Expired"
 msgstr "Pretečeno"
 
-#: ../src/ka-pwdialog.c:175
+#: ../src/ka-pwdialog.c:178
 #, c-format
 msgid "Couldn't acquire kerberos ticket: '%s'"
 msgstr "Ni mogoče pridobiti vstopnice kerberos: '%s'"
 
-#: ../src/ka-pwdialog.c:212
-#: ../src/ka-applet.c:359
+#: ../src/ka-pwdialog.c:217
+#: ../src/ka-applet.c:361
 #, c-format
 msgid "Your credentials expire in %d minute"
 msgid_plural "Your credentials expire in %d minutes"
@@ -58,25 +62,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:217
-#: ../src/ka-applet.c:364
+#: ../src/ka-pwdialog.c:222
+#: ../src/ka-applet.c:366
 msgid "Your credentials have expired"
 msgstr "Vaša poverila so potekla"
 
-#: ../src/ka-pwdialog.c:237
+#: ../src/ka-pwdialog.c:245
 msgid "Please enter your Kerberos password:"
 msgstr "Vnesite svoje geslo Kerberos:"
 
-#: ../src/ka-pwdialog.c:248
+#: ../src/ka-pwdialog.c:258
 #, c-format
 msgid "Please enter the password for '%s':"
 msgstr "Vnesite geslo za '%s':"
 
-#: ../src/ka-pwdialog.c:263
+#: ../src/ka-pwdialog.c:276
 msgid "The password you entered is invalid"
 msgstr "Vneseno geslo je neveljavno"
 
-#: ../src/ka-pwdialog.c:279
+#: ../src/ka-pwdialog.c:292
 #, c-format
 msgid "%s Error"
 msgstr "%s napaka"
@@ -1388,65 +1392,65 @@ 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:353
+#: ../src/ka-applet.c:355
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "Vaša poverila potečejo v %.2d%.2dh"
 
-#: ../src/ka-applet.c:535
+#: ../src/ka-applet.c:537
 msgid "List Tickets"
 msgstr "Izpiši vstopnice"
 
-#: ../src/ka-applet.c:545
+#: ../src/ka-applet.c:547
 msgid "Get Ticket"
 msgstr "Dobi vstopnico"
 
-#: ../src/ka-applet.c:554
+#: ../src/ka-applet.c:556
 msgid "Don't show me this again"
 msgstr "Tega ne prikaži več"
 
-#: ../src/ka-applet.c:561
+#: ../src/ka-applet.c:563
 msgid "Remove Credentials Cache"
 msgstr "Odstrani predpomnilnik varoval"
 
-#: ../src/ka-applet.c:609
+#: ../src/ka-applet.c:611
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Osvežili ste svoja poverila Kerberos"
 
-#: ../src/ka-applet.c:611
+#: ../src/ka-applet.c:613
 msgid "Network credentials valid"
 msgstr "Omrežna varovala so veljavna"
 
-#: ../src/ka-applet.c:630
+#: ../src/ka-applet.c:632
 msgid "Network credentials expiring"
 msgstr "Omrežna varovala bodo potekla"
 
-#: ../src/ka-applet.c:648
+#: ../src/ka-applet.c:650
 msgid "Network credentials expired"
 msgstr "Omrežna varovala so potekla"
 
-#: ../src/ka-applet.c:649
+#: ../src/ka-applet.c:651
 msgid "Your Kerberos credentails have expired."
 msgstr "Vaša varovala Kerberos so potekla."
 
-#: ../src/ka-applet.c:692
+#: ../src/ka-applet.c:694
 #, c-format
 msgid "There was an error launching the preferences dialog: %s"
 msgstr "Prišlo je do napake med zagonom pogovornega okna možnosti: %s"
 
 #. Translators: add the translators of your language here
-#: ../src/ka-applet.c:739
+#: ../src/ka-applet.c:740
 msgid "translator-credits"
 msgstr ""
 "Andrej Žnidaršič\n"
 "Matej Urbančič"
 
-#: ../src/ka-applet.c:784
+#: ../src/ka-applet.c:785
 msgid "Remove Credentials _Cache"
 msgstr "Odstrani _predpomnilnik varoval"
 
 #. Ticket dialog
-#: ../src/ka-applet.c:794
+#: ../src/ka-applet.c:795
 msgid "_List Tickets"
 msgstr "_Naštej vstopnice"
 
@@ -1459,31 +1463,31 @@ msgstr ""
 "Prišlo je do napake med prikazovanjem pomoči:\n"
 "%s"
 
-#: ../src/ka-tickets.c:54
+#: ../src/ka-tickets.c:56
 msgid "Principal"
 msgstr "Ravnatelj"
 
-#: ../src/ka-tickets.c:60
+#: ../src/ka-tickets.c:62
 msgid "Start Time"
 msgstr "Začetni čas"
 
-#: ../src/ka-tickets.c:66
+#: ../src/ka-tickets.c:68
 msgid "End Time"
 msgstr "Končni čas"
 
-#: ../src/ka-tickets.c:72
+#: ../src/ka-tickets.c:73
 msgid "Fwd"
 msgstr "Posreduj"
 
-#: ../src/ka-tickets.c:78
+#: ../src/ka-tickets.c:79
 msgid "Proxy"
 msgstr "Posredovalni strežnik"
 
-#: ../src/ka-tickets.c:84
+#: ../src/ka-tickets.c:85
 msgid "Renew"
 msgstr "Obnovi"
 
-#: ../src/ka-tickets.c:107
+#: ../src/ka-tickets.c:109
 msgid "Error displaying service ticket information"
 msgstr "Napaka med prikazovanjem podrobnosti storitvene vstopnice"
 
@@ -1594,96 +1598,104 @@ msgid "Set your Kerberos network authentication preferences"
 msgstr "Nastavitev možnosti Kerberos overitve omrežja"
 
 #: ../cc-panel/ka-panel.ui.h:1
-msgid "Applet"
-msgstr "Aplet"
-
-#: ../cc-panel/ka-panel.ui.h:2
 msgid "Certificate and private key used for authentication"
 msgstr "Potrdilo in osebni ključ uporabljena za overitev"
 
+#: ../cc-panel/ka-panel.ui.h:2
+msgid "Certificate used to verify digital signatures."
+msgstr "Potrdilo, ki se uporablja za potrjevanje digitalnih podpisov."
+
 #: ../cc-panel/ka-panel.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."
+
+#: ../cc-panel/ka-panel.ui.h:4
 msgid "If checked, request forwardable tickets"
 msgstr "Izbrana možnost določi zahtevo za uporabo prenosljivih vstopnic"
 
-#: ../cc-panel/ka-panel.ui.h:4
+#: ../cc-panel/ka-panel.ui.h:5
 msgid "If checked, request proxiable tickets"
 msgstr "Izbrana možnost omogoči zahtevo za posredovalno vstopnico"
 
-#: ../cc-panel/ka-panel.ui.h:5
+#: ../cc-panel/ka-panel.ui.h:6
 msgid "If checked, request renewable tickets"
 msgstr "Izbrana možnost določi zahtevo za uporabo obnovljivih vstopnic"
 
-#: ../cc-panel/ka-panel.ui.h:6
+#: ../cc-panel/ka-panel.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"
 
-#: ../cc-panel/ka-panel.ui.h:7
+#: ../cc-panel/ka-panel.ui.h:8
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: ../cc-panel/ka-panel.ui.h:8
+#: ../cc-panel/ka-panel.ui.h:9
+msgid "Kerberos Ticket Options"
+msgstr "Možnosti vstopnice Kerberos"
+
+#: ../cc-panel/ka-panel.ui.h:10
 msgid "Kerberos User"
 msgstr "Uporabnik Kerberos"
 
-#: ../cc-panel/ka-panel.ui.h:9
+#: ../cc-panel/ka-panel.ui.h:11
 msgid "Kerberos principal:"
 msgstr "Kerberos ravnatelj:"
 
-#: ../cc-panel/ka-panel.ui.h:10
+#: ../cc-panel/ka-panel.ui.h:12
 msgid "Notifications"
 msgstr "Obvestila"
 
-#: ../cc-panel/ka-panel.ui.h:11
-msgid "PKINIT:"
-msgstr "PKINIT:"
+#: ../cc-panel/ka-panel.ui.h:13
+msgid "PKINIT"
+msgstr "PKINIT"
 
-#: ../cc-panel/ka-panel.ui.h:12
+#: ../cc-panel/ka-panel.ui.h:14
 msgid "Requested Kerberos tickets should be:"
 msgstr "Zahtevane vstopnice Kerberos bi morale biti:"
 
-#: ../cc-panel/ka-panel.ui.h:13
+#: ../cc-panel/ka-panel.ui.h:15
 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."
 
-#: ../cc-panel/ka-panel.ui.h:14
-msgid "Ticket Options"
-msgstr "Možnosti vstopnice"
+#: ../cc-panel/ka-panel.ui.h:16
+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."
 
-#: ../cc-panel/ka-panel.ui.h:15
+#: ../cc-panel/ka-panel.ui.h:17
 msgid "Use Smartcard"
 msgstr "Uporabi SmartCard"
 
-#: ../cc-panel/ka-panel.ui.h:16
-msgid "Userid:"
-msgstr "Uporabniški ID:"
+#: ../cc-panel/ka-panel.ui.h:18
+msgid "Userid"
+msgstr "Uporabniški id"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../cc-panel/ka-panel.ui.h:18
+#: ../cc-panel/ka-panel.ui.h:20
 msgid "Warn"
 msgstr "Opozori"
 
-#: ../cc-panel/ka-panel.ui.h:19
-msgid "X509 trust anchors:"
-msgstr "X509 zaupna sidra:"
+#: ../cc-panel/ka-panel.ui.h:21
+msgid "X509 trust anchors"
+msgstr "X509 zaupna sidra"
 
-#: ../cc-panel/ka-panel.ui.h:20
+#: ../cc-panel/ka-panel.ui.h:22
 msgid "_Browse..."
 msgstr "_Prebrskaj ..."
 
-#: ../cc-panel/ka-panel.ui.h:21
+#: ../cc-panel/ka-panel.ui.h:23
 msgid "forwardable"
 msgstr "prenosljiva"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../cc-panel/ka-panel.ui.h:23
-msgid "minutes before expiry"
-msgstr "minut pred iztekom"
+#: ../cc-panel/ka-panel.ui.h:25
+msgid "minutes before ticket expiry"
+msgstr "Opozorilo pred potekom v minutah"
 
-#: ../cc-panel/ka-panel.ui.h:24
+#: ../cc-panel/ka-panel.ui.h:26
 msgid "proxiable"
 msgstr "posredovana"
 
-#: ../cc-panel/ka-panel.ui.h:25
+#: ../cc-panel/ka-panel.ui.h:27
 msgid "renewable"
 msgstr "obnovljiva"
 
@@ -1699,6 +1711,8 @@ msgstr "X509 potrdila"
 msgid "all files"
 msgstr "vse datoteke"
 
+#~ msgid "Applet"
+#~ msgstr "Aplet"
 #~ msgid "Network Authentication"
 #~ msgstr "Overitev omrežja"
 #~ msgid "Show a trayicon in the status area of the panel"