aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2011-04-06 16:25:02 +0200
committerGuido Günther <agx@sigxcpu.org>2011-04-06 16:25:02 +0200
commit1309781b9a761e1678662aafcf21dd9d3a6fe905 (patch)
tree71823bee7cb6df2f371437b9a4022aa03fe5a295
parentDocument changes and release 2.91.93-1 (diff)
parentNew upstream version 3.0.0 (diff)
downloadkrb5-auth-dialog-1309781b9a761e1678662aafcf21dd9d3a6fe905.tar.gz
krb5-auth-dialog-1309781b9a761e1678662aafcf21dd9d3a6fe905.tar.bz2
krb5-auth-dialog-1309781b9a761e1678662aafcf21dd9d3a6fe905.zip
Merge commit 'upstream/3.0.0'
-rw-r--r--ChangeLog137
-rw-r--r--NEWS11
-rw-r--r--cc-panel/gnome-ka-panel.desktop.in2
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac2
-rw-r--r--krb5-auth-dialog.spec2
-rw-r--r--po/de.po268
-rw-r--r--po/es.po15
-rw-r--r--po/nb.po260
-rw-r--r--po/sl.po158
-rw-r--r--src/ka-applet.c19
-rw-r--r--src/ka-dbus.c8
-rw-r--r--src/ka-tickets.c72
-rw-r--r--src/org.gnome.KrbAuthDialog.service.in2
14 files changed, 570 insertions, 406 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bd29da..bf8db57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,142 @@
# Generated by Makefile. Do not edit.
+commit 048b63e48ac57a63ecb3759f0a58c431ee09bf4f
+Author: Guido Günther <agx@sigxcpu.org>
+Date: Mon Apr 4 15:20:33 2011 +0200
+
+ Bump version to 3.0.0
+
+ NEWS | 11 +++++++++++
+ configure.ac | 2 +-
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+commit b9431bc950ff61e0985abd106b4a68402376b355
+Author: Guido Günther <agx@sigxcpu.org>
+Date: Fri Apr 1 18:35:44 2011 +0200
+
+ Move object registration from name acquired to bus acquired
+
+ This unbreaks dbus based activation where the exported interfaces
+ wouldn't be available when the application first requesting it looks at
+ it resulting in:
+
+ DBusException: org.freedesktop.DBus.Error.UnknownMethod: No such interface `org.gnome.KrbAuthDialog' on object at path /org/gnome/KrbAuthDialog
+
+ src/ka-dbus.c | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit a5b7c21fba6f99afb768604a20fe394edee9dd16
+Author: Guido Günther <agx@sigxcpu.org>
+Date: Fri Apr 1 17:54:28 2011 +0200
+
+ Remove superfluous default argument
+
+ src/org.gnome.KrbAuthDialog.service.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 94643b1b79172860c09efcfe8be874170f69562d
+Author: Guido Günther <agx@sigxcpu.org>
+Date: Fri Apr 1 16:11:36 2011 +0200
+
+ Update copyright and comments
+
+ src/ka-applet.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 6dbcd27838a820d98421af9cdbe9955d1d003902
+Author: Mario Blättermann <mariobl@gnome.org>
+Date: Thu Mar 31 22:37:50 2011 +0200
+
+ [l10n] Updated German translation
+
+ po/de.po | 268 ++++++++++++++++++++++++++++++--------------------------------
+ 1 files changed, 131 insertions(+), 137 deletions(-)
+
+commit cdc8fd453e1c4fc52472409eadb5a61d616c240b
+Author: Guido Günther <agx@sigxcpu.org>
+Date: Wed Mar 30 15:25:55 2011 +0200
+
+ Simplify by using gtk_tree_view_insert_column_with_attributes
+
+ src/ka-tickets.c | 72 +++++++++++++++++++++++++++---------------------------
+ 1 files changed, 36 insertions(+), 36 deletions(-)
+
+commit 5ec9b6df318c816f3d1ff1604baba5f6a3a0dc2b
+Author: Guido Günther <agx@sigxcpu.org>
+Date: Wed Mar 30 15:04:01 2011 +0200
+
+ Ignore generated bz2 files
+
+ .gitignore | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 2d61d9a54da71c87d6f6837eb5fb5db883aafe73
+Author: Guido Günther <agx@sigxcpu.org>
+Date: Wed Mar 30 14:58:31 2011 +0200
+
+ Special case initial notification
+
+ this makes sure the user sees an initial notification and the
+ notification message doesn't talk about "refreshing" when we're actually
+ just reporting the current status.
+
+ src/ka-applet.c | 13 +++++++++----
+ 1 files changed, 9 insertions(+), 4 deletions(-)
+
+commit aa02873b65668c69067090041af3803fc753b239
+Author: Guido Günther <agx@sigxcpu.org>
+Date: Wed Mar 30 14:03:53 2011 +0200
+
+ Fix description for translators
+
+ cc-panel/gnome-ka-panel.desktop.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 589643460d363128ca5ef268aa49d0501bf65206
+Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
+Date: Tue Mar 29 16:16:32 2011 +0200
+
+ Updated Slovenian translation
+
+ po/sl.po | 158 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 86 insertions(+), 72 deletions(-)
+
+commit 9cf49075f942fb0ae67685458bedca8ef0449912
+Author: Kjartan Maraas <kmaraas@gnome.org>
+Date: Mon Mar 28 20:39:34 2011 +0200
+
+ Updated Norwegian bokmål translation
+
+ po/nb.po | 260 +++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 132 insertions(+), 128 deletions(-)
+
+commit 378378f939868df01669042d1a5f8e1541950b10
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date: Mon Mar 28 19:07:48 2011 +0200
+
+ Updated Spanish translation
+
+ po/es.po | 15 +++++++--------
+ 1 files changed, 7 insertions(+), 8 deletions(-)
+
+commit 8c28c8a6500fa28426a493c1c26039a0c2668d93
+Author: Guido Günther <agx@sigxcpu.org>
+Date: Sun Mar 27 22:15:22 2011 +0200
+
+ Add bug-database and download-page
+
+ krb5-auth-dialog.doap | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 8c192286510afa28b056317321b062f107d6f994
+Author: Guido Günther <agx@sigxcpu.org>
+Date: Sun Mar 27 22:08:55 2011 +0200
+
+ Add description to doap file
+
+ krb5-auth-dialog.doap | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
commit 3504c98b48de8abd16d9331c332a0fed09803b2f
Author: Guido Günther <agx@sigxcpu.org>
Date: Sat Mar 26 08:46:35 2011 +0100
diff --git a/NEWS b/NEWS
index 70141d4..1af5554 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+=============
+Version 3.0.0
+=============
+* fix DBus activation
+* fix missing initial notification
+* UI translations:
+ Andrej Žnidaršič (sl)
+ Daniel Mustieles (es)
+ Kjartan Maraas (nb)
+ Mario Blättermann (de)
+
===============
Version 2.91.93
===============
diff --git a/cc-panel/gnome-ka-panel.desktop.in b/cc-panel/gnome-ka-panel.desktop.in
index f7105c5..753ed59 100644
--- a/cc-panel/gnome-ka-panel.desktop.in
+++ b/cc-panel/gnome-ka-panel.desktop.in
@@ -13,5 +13,5 @@ X-GNOME-Settings-Panel=ka-panel
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=krb5-auth-dialog
X-GNOME-Bugzilla-Component=general
-# Translators: those are keywords for the example control-center panel
+# Translators: those are keywords for the Kerberos authentication control-center panel
_X-GNOME-Keywords=Kerberos;Authentication
diff --git a/configure b/configure
index fbbfc58..c7db1eb 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.67 for krb5-auth-dialog 2.91.93.
+# Generated by GNU Autoconf 2.67 for krb5-auth-dialog 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='krb5-auth-dialog'
PACKAGE_TARNAME='krb5-auth-dialog'
-PACKAGE_VERSION='2.91.93'
-PACKAGE_STRING='krb5-auth-dialog 2.91.93'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='krb5-auth-dialog 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1551,7 +1551,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 2.91.93 to adapt to many kinds of systems.
+\`configure' configures krb5-auth-dialog 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1622,7 +1622,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of krb5-auth-dialog 2.91.93:";;
+ short | recursive ) echo "Configuration of krb5-auth-dialog 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1783,7 +1783,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-krb5-auth-dialog configure 2.91.93
+krb5-auth-dialog configure 3.0.0
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2205,7 +2205,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 2.91.93, which was
+It was created by krb5-auth-dialog $as_me 3.0.0, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -3021,7 +3021,7 @@ fi
# Define the identity of the package.
PACKAGE='krb5-auth-dialog'
- VERSION='2.91.93'
+ VERSION='3.0.0'
cat >>confdefs.h <<_ACEOF
@@ -15655,7 +15655,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 2.91.93, which was
+This file was extended by krb5-auth-dialog $as_me 3.0.0, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15721,7 +15721,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 2.91.93
+krb5-auth-dialog config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 7a12ab5..779e76e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([krb5-auth-dialog],[2.91.93])
+AC_INIT([krb5-auth-dialog],[3.0.0])
AC_CONFIG_SRCDIR(src/ka-dialog.c)
dnl Make automake keep quiet about wildcards & other GNUmake-isms
AM_INIT_AUTOMAKE([1.11.1 dist-bzip2 -Wno-portability])
diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec
index 6a7ceb2..7c7fbc0 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: 2.91.93
+Version: 3.0.0
Release: 1
License: GPL
Group: User Interface/X
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"
diff --git a/src/ka-applet.c b/src/ka-applet.c
index 2d4981e..441ed94 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -81,7 +81,7 @@ struct _KaAppletPrivate {
gboolean ns_persistence; /* does the notification server support persistence */
KaPwDialog *pwdialog; /* the password dialog */
- int pw_prompt_secs; /* when to start prompting for a password */
+ int pw_prompt_secs; /* when to start sending notifications */
KaPluginLoader *loader; /* Plugin loader */
NotifyNotification *notification; /* notification messages */
@@ -530,7 +530,7 @@ ka_send_event_notification (KaApplet *self,
}
notify_notification_clear_actions(notification);
- /* Add List Tickets button until we moved this into cc-panl */
+
if (self->priv->ns_persistence) {
notify_notification_add_action (notification,
"ka-list-tickets",
@@ -591,14 +591,14 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
int remaining = expiry - now;
static int last_warn = 0;
static gboolean expiry_notified = FALSE;
+ static gboolean initial_notification = TRUE;
static krb5_timestamp old_expiry = 0;
gboolean notify = TRUE;
const char *status_icon = ka_applet_select_icon (applet, remaining);
char *tooltip_text = ka_applet_tooltip_text (remaining);
-
if (remaining > 0) {
- if (expiry_notified) {
+ if (expiry_notified || initial_notification) {
const char* msg;
ka_gconf_get_bool (applet->priv->gconf,
KA_GCONF_KEY_NOTIFY_VALID, &notify);
@@ -607,8 +607,12 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
if (applet->priv->krb_msg)
msg = applet->priv->krb_msg;
- else
- msg = _("You've refreshed your Kerberos credentials.");
+ else {
+ if (initial_notification)
+ msg = _("You have valid Kerberos credentials.");
+ else
+ msg = _("You've refreshed your Kerberos credentials.");
+ }
ka_send_event_notification (applet,
_("Network credentials valid"),
msg,
@@ -661,6 +665,7 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry)
old_expiry = expiry;
ka_update_tray_icon(applet, status_icon, tooltip_text);
g_free (tooltip_text);
+ initial_notification = FALSE;
return 0;
}
@@ -731,7 +736,7 @@ ka_applet_cb_about_dialog (GtkMenuItem *menuitem G_GNUC_UNUSED,
"logo-icon-name", "krb-valid-ticket",
"copyright",
"Copyright (C) 2004,2005,2006 Red Hat, Inc.,\n"
- "2008,2009 Guido Günther",
+ "2008-2011 Guido Günther",
"website-label", PACKAGE " website",
"website",
"https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/",
diff --git a/src/ka-dbus.c b/src/ka-dbus.c
index 4a7be2c..a79f85f 100644
--- a/src/ka-dbus.c
+++ b/src/ka-dbus.c
@@ -171,9 +171,9 @@ static const GDBusInterfaceVTable interface_vtable =
static void
-ka_dbus_on_name_acquired (GDBusConnection *connection,
- const gchar *name G_GNUC_UNUSED,
- gpointer user_data)
+ka_dbus_on_bus_acquired (GDBusConnection *connection,
+ const gchar *name G_GNUC_UNUSED,
+ gpointer user_data)
{
KaApplet *applet = user_data;
guint id;
@@ -233,8 +233,8 @@ ka_dbus_connect (KaApplet *applet)
dbus_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
"org.gnome.KrbAuthDialog",
G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT,
+ ka_dbus_on_bus_acquired,
NULL,
- ka_dbus_on_name_acquired,
ka_dbus_on_name_lost,
applet,
NULL);
diff --git a/src/ka-tickets.c b/src/ka-tickets.c
index c7d9ea7..ce01fce 100644
--- a/src/ka-tickets.c
+++ b/src/ka-tickets.c
@@ -33,7 +33,6 @@ GtkWidget *
ka_tickets_dialog_create (GtkBuilder *xml)
{
GtkCellRenderer *text_renderer, *toggle_renderer;
- GtkTreeViewColumn *column;
GtkTreeView *tickets_view;
tickets = gtk_list_store_new (N_COLUMNS,
@@ -53,41 +52,42 @@ ka_tickets_dialog_create (GtkBuilder *xml)
text_renderer = gtk_cell_renderer_text_new ();
toggle_renderer = gtk_cell_renderer_toggle_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Principal"),
- text_renderer,
- "text",
- PRINCIPAL_COLUMN,
- NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (tickets_view), column);
- column = gtk_tree_view_column_new_with_attributes (_("Start Time"),
- text_renderer,
- "text",
- START_TIME_COLUMN,
- NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (tickets_view), column);
- column = gtk_tree_view_column_new_with_attributes (_("End Time"),
- text_renderer,
- "markup",
- END_TIME_COLUMN, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (tickets_view), column);
- column = gtk_tree_view_column_new_with_attributes (_("Fwd"),
- toggle_renderer,
- "active",
- FORWARDABLE_COLUMN,
- NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (tickets_view), column);
- column = gtk_tree_view_column_new_with_attributes (_("Proxy"),
- toggle_renderer,
- "active",
- PROXIABLE_COLUMN,
- NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (tickets_view), column);
- column = gtk_tree_view_column_new_with_attributes (_("Renew"),
- toggle_renderer,
- "active",
- RENEWABLE_COLUMN,
- NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (tickets_view), column);
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ _("Principal"),
+ text_renderer,
+ "text",
+ PRINCIPAL_COLUMN,
+ NULL);
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ _("Start Time"),
+ text_renderer,
+ "text",
+ START_TIME_COLUMN,
+ NULL);
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ _("End Time"),
+ text_renderer,
+ "markup",
+ END_TIME_COLUMN,
+ NULL);
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ _("Fwd"),
+ toggle_renderer,
+ "active",
+ FORWARDABLE_COLUMN,
+ NULL);
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ _("Proxy"),
+ toggle_renderer,
+ "active",
+ PROXIABLE_COLUMN,
+ NULL);
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tickets_view), -1,
+ _("Renew"),
+ toggle_renderer,
+ "active",
+ RENEWABLE_COLUMN,
+ NULL);
return tickets_dialog;
}
diff --git a/src/org.gnome.KrbAuthDialog.service.in b/src/org.gnome.KrbAuthDialog.service.in
index f49546a..c8c3632 100644
--- a/src/org.gnome.KrbAuthDialog.service.in
+++ b/src/org.gnome.KrbAuthDialog.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.gnome.KrbAuthDialog
-Exec=@BINDIR@/krb5-auth-dialog -A
+Exec=@BINDIR@/krb5-auth-dialog
bgstack15