From 2a51379a21903f4df0b43d0c83b670b66fbc8e4a Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Thu, 24 Feb 2011 20:00:30 +0100 Subject: New upstream version 2.91.90 --- ChangeLog | 88 +++++++++- NEWS | 19 ++- configure | 20 +-- configure.ac | 2 +- krb5-auth-dialog.spec | 2 +- po/POTFILES.in | 2 +- po/es.po | 159 +++++++++--------- po/sl.po | 150 +++++++++-------- po/sv.po | 416 ++++++++++++++++++++++++----------------------- src/Makefile.am | 2 +- src/Makefile.in | 2 +- src/ka-applet.c | 36 ++-- src/ka-dialog.c | 20 ++- src/krb5-auth-dialog.ui | 216 ++++++++++++++++++++++++ src/krb5-auth-dialog.xml | 216 ------------------------ 15 files changed, 737 insertions(+), 613 deletions(-) create mode 100644 src/krb5-auth-dialog.ui delete mode 100644 src/krb5-auth-dialog.xml diff --git a/ChangeLog b/ChangeLog index 4b8d128..c5be144 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,88 @@ # Generated by Makefile. Do not edit. -commit 1c8b99d5acc234896017d32087ff0204bf56d5ea +commit 1824f443fcd94b2cce375d3f3b3d1636230e332b +Author: Guido Günther +Date: Thu Feb 24 19:39:37 2011 +0100 + + Bump version to 2.91.90 + + NEWS | 15 ++++++++++++++- + configure.ac | 2 +- + 2 files changed, 15 insertions(+), 2 deletions(-) + +commit 1c3f34f7dd486e50ed8ba89baff13042ae2bed69 +Author: Guido Günther +Date: Thu Feb 24 19:26:11 2011 +0100 + + Check credential cache status when entering the mainloop + + Instead of waiting for the first time the expiry timer kicks in check + for valid tickets once we've set up everything. + + src/ka-dialog.c | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +commit 6c81e8cbf5c9a59f4412fcd96668ec192e7311bd +Author: Guido Günther +Date: Thu Feb 24 18:28:51 2011 +0100 + + Make always_run the default + + Debian Bug: #582497 + + src/ka-dialog.c | 10 ++++------ + 1 files changed, 4 insertions(+), 6 deletions(-) + +commit ab3c8a7335af2b9a881eb05c1e71e2679ac46338 +Author: Guido Günther +Date: Thu Feb 24 13:20:13 2011 +0100 + + Add a band aid for #642666 + + src/ka-applet.c | 34 ++++++++++++++++++++++------------ + 1 files changed, 22 insertions(+), 12 deletions(-) + +commit 0497c19b4ece56ce68837f032f3c87866d9011ba +Author: Guido Günther +Date: Tue Feb 15 21:36:30 2011 +0100 + + Rename the UI definitions to .ui + + po/POTFILES.in | 2 +- + src/Makefile.am | 2 +- + src/ka-applet.c | 2 +- + src/krb5-auth-dialog.ui | 216 ++++++++++++++++++++++++++++++++++++++++++++++ + src/krb5-auth-dialog.xml | 216 ---------------------------------------------- + 5 files changed, 219 insertions(+), 219 deletions(-) + +commit 286054dfc9dabd0fa10d229ae1c71a9f2dd40326 +Author: Andrej Žnidaršič +Date: Sat Feb 19 11:12:34 2011 +0100 + + Updated Slovenian translation + + po/sl.po | 150 ++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 74 insertions(+), 76 deletions(-) + +commit ba63a6711ab3e0b286ea29ff9a576681c0241a9c +Author: Daniel Nylander +Date: Tue Feb 15 22:16:17 2011 +0100 + + Updated Swedish translation + + po/sv.po | 416 ++++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 213 insertions(+), 203 deletions(-) + +commit 88acc9ee38f59eaf5800e49cd94c767d5dafdbc8 +Author: Daniel Mustieles +Date: Tue Feb 15 21:31:36 2011 +0100 + + Updated Spanish translation + + po/es.po | 159 +++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 81 insertions(+), 78 deletions(-) + +commit 6ab2def9525e9a8c6d7520bd7ffbaea0b9d5545c Author: Guido Günther Date: Mon Feb 14 08:35:35 2011 +0100 @@ -12,11 +94,11 @@ Date: Mon Feb 14 08:35:35 2011 +0100 configure.ac | 2 +- 2 files changed, 24 insertions(+), 1 deletions(-) -commit 1374a17d8a5b6e65514a6eda9c86fed74ffa62cd +commit 255bc9697d0e0542c5ea367fb2dbec2e18d3100b Author: Guido Günther Date: Mon Feb 14 18:54:58 2011 +0100 - Use KA_NAME instead of PACKAGENAME + Use KA_NAME instead of PACKAGE for a translatable application name in the notification area diff --git a/NEWS b/NEWS index b2602c1..cfad6e0 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,22 @@ =============== -Version 2.91.6 +Version 2.91.90 =============== +* Check credential cache right after startup so the user gets immediate + feedback about her/his Kerberos tickets. +* Make "always run" the default, don't exit when no ticket cache exists +* Try harder to detect the notification daemon's persistence capabilities + during the autostart phase (works around #642666) +* UI translations: + Andrej Žnidaršič (sl) + Daniel Mustieles (es) + Daniel Nylander (sv) + +============== +Version 2.91.6 +============== * Add "Get ticket" button to notifications -* Disable tray icon if the notification server supports persistent notificaions -* Move preferences to cc-panel +* Disable tray icon if the notification server supports persistent notifications +* Move preferences to a gnome-control-center panel * Display account expiry prompts returned by the KDC * Drop gtksecentry and use GtkEntryBuffer with secmem instead * Use NMClient GObject instead of deprecated functions diff --git a/configure b/configure index 0769571..932044d 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.6. +# Generated by GNU Autoconf 2.67 for krb5-auth-dialog 2.91.90. # # # 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.6' -PACKAGE_STRING='krb5-auth-dialog 2.91.6' +PACKAGE_VERSION='2.91.90' +PACKAGE_STRING='krb5-auth-dialog 2.91.90' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1555,7 +1555,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.6 to adapt to many kinds of systems. +\`configure' configures krb5-auth-dialog 2.91.90 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1626,7 +1626,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of krb5-auth-dialog 2.91.6:";; + short | recursive ) echo "Configuration of krb5-auth-dialog 2.91.90:";; esac cat <<\_ACEOF @@ -1789,7 +1789,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -krb5-auth-dialog configure 2.91.6 +krb5-auth-dialog configure 2.91.90 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2211,7 +2211,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.6, which was +It was created by krb5-auth-dialog $as_me 2.91.90, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3027,7 +3027,7 @@ fi # Define the identity of the package. PACKAGE='krb5-auth-dialog' - VERSION='2.91.6' + VERSION='2.91.90' cat >>confdefs.h <<_ACEOF @@ -15752,7 +15752,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.6, which was +This file was extended by krb5-auth-dialog $as_me 2.91.90, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15818,7 +15818,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.6 +krb5-auth-dialog config.status 2.91.90 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b61a720..80509e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([krb5-auth-dialog], [2.91.6]) +AC_INIT([krb5-auth-dialog], [2.91.90]) AC_CONFIG_SRCDIR(src/ka-dialog.c) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([-Wno-portability]) diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec index 79306b3..ac8a33d 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.6 +Version: 2.91.90 Release: 1 License: GPL Group: User Interface/X diff --git a/po/POTFILES.in b/po/POTFILES.in index f910c0c..279ce6d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ -[type: gettext/glade]src/krb5-auth-dialog.xml +[type: gettext/glade]src/krb5-auth-dialog.ui src/ka-dialog.c src/ka-pwdialog.c src/dummy-strings.c diff --git a/po/es.po b/po/es.po index 5177092..389c784 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&component=general\n" -"POT-Creation-Date: 2011-01-25 13:33+0000\n" -"PO-Revision-Date: 2011-01-26 12:14+0100\n" +"POT-Creation-Date: 2011-02-14 19:51+0000\n" +"PO-Revision-Date: 2011-02-15 17:37+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -20,9 +20,10 @@ msgstr "" "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 -msgid "Network Authentication" -msgstr "Autenticación de red" +#: ../src/krb5-auth-dialog.xml.h:1 ../src/krb5-auth-dialog.desktop.in.h:1 +#: ../cc-panel/gnome-ka-panel.desktop.in.h:1 +msgid "Kerberos Authentication" +msgstr "Autenticación de Kerberos" #: ../src/krb5-auth-dialog.xml.h:2 msgid "Service Tickets" @@ -45,14 +46,14 @@ msgstr "Caducado" msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "No se pudo obtener el tique de Kerberos: «%s»" -#: ../src/ka-pwdialog.c:212 ../src/ka-applet.c:377 +#: ../src/ka-pwdialog.c:212 ../src/ka-applet.c:359 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" msgstr[0] "Sus credenciales caducan en %d minuto" msgstr[1] "Sus credenciales caducan en %d minutos" -#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:382 +#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:364 msgid "Your credentials have expired" msgstr "Sus credenciales han caducado" @@ -1401,57 +1402,67 @@ msgstr "Número mágico erróneo para GSSAPI OID" msgid "Bad magic number for GSSAPI QUEUE" msgstr "Número mágico erróneo para GSSAPI QUEUE" -#: ../src/ka-applet.c:371 +#: ../src/ka-applet.c:353 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Sus credenciales caducan en %.2d:%.2dh" -#: ../src/ka-applet.c:506 -msgid "Don't show me this again" -msgstr "No mostrar este mensaje de nuevo" +#: ../src/ka-applet.c:535 +#| msgid "_List Tickets" +msgid "List Tickets" +msgstr "Listar tiques" -#: ../src/ka-applet.c:513 +#: ../src/ka-applet.c:545 msgid "Get Ticket" msgstr "Obtener tique" +#: ../src/ka-applet.c:554 +msgid "Don't show me this again" +msgstr "No mostrar este mensaje de nuevo" + #: ../src/ka-applet.c:561 +#| msgid "Remove Credentials _Cache" +msgid "Remove Credentials Cache" +msgstr "Quitar la caché de credenciales" + +#: ../src/ka-applet.c:609 msgid "You've refreshed your Kerberos credentials." msgstr "Ha actualizado sus credenciales de Kerberos." -#: ../src/ka-applet.c:563 +#: ../src/ka-applet.c:611 msgid "Network credentials valid" msgstr "Credenciales de red válidas" -#: ../src/ka-applet.c:582 +#: ../src/ka-applet.c:630 msgid "Network credentials expiring" msgstr "Las credenciales de red van a caducar" -#: ../src/ka-applet.c:600 +#: ../src/ka-applet.c:648 msgid "Network credentials expired" msgstr "Las credenciales de red han caducado" -#: ../src/ka-applet.c:601 +#: ../src/ka-applet.c:649 msgid "Your Kerberos credentails have expired." msgstr "Sus credenciales Kerberos han caducado" -#: ../src/ka-applet.c:645 +#: ../src/ka-applet.c:692 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "Hubo un error al lanzar el diálogo de preferencias: %s" #. Translators: add the translators of your language here -#: ../src/ka-applet.c:692 +#: ../src/ka-applet.c:739 msgid "translator-credits" msgstr "" "Jorge González , 2009-2010\n" "Daniel Mustieles , 2009" -#: ../src/ka-applet.c:737 +#: ../src/ka-applet.c:784 msgid "Remove Credentials _Cache" msgstr "Quitar la _caché de credenciales" #. Ticket dialog -#: ../src/ka-applet.c:747 +#: ../src/ka-applet.c:794 msgid "_List Tickets" msgstr "_Listar tiques" @@ -1492,7 +1503,7 @@ msgstr "Renovar" msgid "Error displaying service ticket information" msgstr "Error al mostrar la información del tique de servicio" -#: ../src/krb5-auth-dialog.desktop.in.h:1 +#: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Diálogo de autenticación de red de Kerberos" @@ -1561,36 +1572,28 @@ msgid "Requested tickets should be renewable" msgstr "Los tiques solicitados deberán ser renovables" #: ../src/krb5-auth-dialog.schemas.in.h:17 -msgid "Show a trayicon in the status area of the panel" -msgstr "Mostrar un icono en la bandeja del sistema en el área del panel" - -#: ../src/krb5-auth-dialog.schemas.in.h:18 -msgid "Show trayicon" -msgstr "Mostrar icono en la bandeja" - -#: ../src/krb5-auth-dialog.schemas.in.h:19 msgid "" "Start prompting/displaying notifications that many minutes before expiry" msgstr "Dejar de mostrar notificaciones esos minutos antes de que caduque" -#: ../src/krb5-auth-dialog.schemas.in.h:20 +#: ../src/krb5-auth-dialog.schemas.in.h:18 msgid "The kerberos principal to acquire the ticket for" msgstr "El principal de Kerberos para el que adquirir el tique" -#: ../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 "" "El identificador público/privado/certificado del principal al usar PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:22 +#: ../src/krb5-auth-dialog.schemas.in.h:20 msgid "ticket expired notification" msgstr "notificación de tique caducado" -#: ../src/krb5-auth-dialog.schemas.in.h:23 +#: ../src/krb5-auth-dialog.schemas.in.h:21 msgid "ticket expiring notification" msgstr "notificación de caducidad de tique" -#: ../src/krb5-auth-dialog.schemas.in.h:24 +#: ../src/krb5-auth-dialog.schemas.in.h:22 msgid "valid ticket notification" msgstr "tique de notificación válido" @@ -1599,14 +1602,8 @@ msgstr "tique de notificación válido" msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "Advertencia: ejecutar q-agent setuid en este sistema es peligroso\n" -#: ../cc-panel/gnome-ka-panel.desktop.in.h:1 -#| msgid "Kerberos Authentication Configuration" -msgid "Kerberos Authentication" -msgstr "Autenticación de Kerberos" - #. Translators: those are keywords for the example control-center panel #: ../cc-panel/gnome-ka-panel.desktop.in.h:3 -#| msgid "Kerberos Authentication Configuration" msgid "Kerberos;Authentication" msgstr "Kerberos;Autenticación" @@ -1615,64 +1612,55 @@ msgid "Set your Kerberos network authentication preferences" msgstr "Establezca sus preferencias de autenticación de red en Kerberos" #: ../cc-panel/ka-panel.ui.h:1 -msgid "Appearance" -msgstr "Apariencia" - -#: ../cc-panel/ka-panel.ui.h:2 msgid "Applet" msgstr "Miniaplicación" -#: ../cc-panel/ka-panel.ui.h:3 +#: ../cc-panel/ka-panel.ui.h:2 msgid "Certificate and private key used for authentication" msgstr "Certificado y clave privada usados para la autenticación" -#: ../cc-panel/ka-panel.ui.h:4 -msgid "If checked, display the tray icon in the status bar" -msgstr "" -"Si está seleccionado muestra el icono de la bandeja en la barra de estado" - -#: ../cc-panel/ka-panel.ui.h:5 +#: ../cc-panel/ka-panel.ui.h:3 msgid "If checked, request forwardable tickets" msgstr "Si está seleccionado pide tiques reenviables" -#: ../cc-panel/ka-panel.ui.h:6 +#: ../cc-panel/ka-panel.ui.h:4 msgid "If checked, request proxiable tickets" msgstr "Si está seleccionado pide tiques vía proxy" -#: ../cc-panel/ka-panel.ui.h:7 +#: ../cc-panel/ka-panel.ui.h:5 msgid "If checked, request renewable tickets" msgstr "Si está seleccionado pide tiques renovables" -#: ../cc-panel/ka-panel.ui.h:8 +#: ../cc-panel/ka-panel.ui.h:6 msgid "If checked, use a security token (Smartcard) to authenticate." msgstr "" "Si está seleccionado usa un «token» (tarjeta inteligente) para autenticar." -#: ../cc-panel/ka-panel.ui.h:9 +#: ../cc-panel/ka-panel.ui.h:7 msgid "Kerberos" msgstr "Kerberos" -#: ../cc-panel/ka-panel.ui.h:10 +#: ../cc-panel/ka-panel.ui.h:8 msgid "Kerberos User" msgstr "Usuario de Kerberos" -#: ../cc-panel/ka-panel.ui.h:11 +#: ../cc-panel/ka-panel.ui.h:9 msgid "Kerberos principal:" msgstr "Principal de Kerberos:" -#: ../cc-panel/ka-panel.ui.h:12 +#: ../cc-panel/ka-panel.ui.h:10 msgid "Notifications" msgstr "Notificaciones" -#: ../cc-panel/ka-panel.ui.h:13 +#: ../cc-panel/ka-panel.ui.h:11 msgid "PKINIT:" msgstr "PKINIT:" -#: ../cc-panel/ka-panel.ui.h:14 +#: ../cc-panel/ka-panel.ui.h:12 msgid "Requested Kerberos tickets should be:" msgstr "Los tiques solicitados a Kerberos deben ser:" -#: ../cc-panel/ka-panel.ui.h:15 +#: ../cc-panel/ka-panel.ui.h:13 msgid "" "Send notification about ticket expiry that many minutes before it finally " "expires" @@ -1680,64 +1668,79 @@ msgstr "" "Enviar notificación acerca de la caducidad del tique esos minutos antes de " "que caduque" -#: ../cc-panel/ka-panel.ui.h:16 -msgid "Show tray icon" -msgstr "Mostrar icono de la bandeja" - -#: ../cc-panel/ka-panel.ui.h:17 +#: ../cc-panel/ka-panel.ui.h:14 msgid "Ticket Options" msgstr "Opciones del tique" -#: ../cc-panel/ka-panel.ui.h:18 +#: ../cc-panel/ka-panel.ui.h:15 msgid "Use Smartcard" msgstr "Usar tarjeta inteligente" -#: ../cc-panel/ka-panel.ui.h:19 +#: ../cc-panel/ka-panel.ui.h:16 msgid "Userid:" msgstr "ID de usuario:" #. Used in combination: 'Warn x minutes before expiry' -#: ../cc-panel/ka-panel.ui.h:21 +#: ../cc-panel/ka-panel.ui.h:18 msgid "Warn" msgstr "Advertir" -#: ../cc-panel/ka-panel.ui.h:22 +#: ../cc-panel/ka-panel.ui.h:19 msgid "X509 trust anchors:" msgstr "Anclas de confianza de X509:" -#: ../cc-panel/ka-panel.ui.h:23 +#: ../cc-panel/ka-panel.ui.h:20 msgid "_Browse..." msgstr "_Examinar…" -#: ../cc-panel/ka-panel.ui.h:24 +#: ../cc-panel/ka-panel.ui.h:21 msgid "forwardable" msgstr "reenviable" #. Used in combination: 'Warn x minutes before expiry' -#: ../cc-panel/ka-panel.ui.h:26 +#: ../cc-panel/ka-panel.ui.h:23 msgid "minutes before expiry" msgstr "minutos antes de que caduque" -#: ../cc-panel/ka-panel.ui.h:27 +#: ../cc-panel/ka-panel.ui.h:24 msgid "proxiable" msgstr "vía proxy" -#: ../cc-panel/ka-panel.ui.h:28 +#: ../cc-panel/ka-panel.ui.h:25 msgid "renewable" msgstr "renovable" -#: ../cc-panel/cc-ka-panel.c:346 +#: ../cc-panel/cc-ka-panel.c:345 msgid "Choose Certificate" msgstr "Elija un certificado" -#: ../cc-panel/cc-ka-panel.c:362 +#: ../cc-panel/cc-ka-panel.c:361 msgid "X509 Certificates" msgstr "Certificados X509" -#: ../cc-panel/cc-ka-panel.c:366 +#: ../cc-panel/cc-ka-panel.c:365 msgid "all files" msgstr "todos los archivos" +#~ msgid "Network Authentication" +#~ msgstr "Autenticación de red" + +#~ msgid "Show a trayicon in the status area of the panel" +#~ msgstr "Mostrar un icono en la bandeja del sistema en el área del panel" + +#~ msgid "Show trayicon" +#~ msgstr "Mostrar icono en la bandeja" + +#~ msgid "Appearance" +#~ msgstr "Apariencia" + +#~ msgid "If checked, display the tray icon in the status bar" +#~ msgstr "" +#~ "Si está seleccionado muestra el icono de la bandeja en la barra de estado" + +#~ msgid "Show tray icon" +#~ msgstr "Mostrar icono de la bandeja" + #~ msgid "" #~ "There was an error displaying %s:\n" #~ "%s" diff --git a/po/sl.po b/po/sl.po index dd4184c..187e632 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,9 +8,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-01-26 21:03+0000\n" -"PO-Revision-Date: 2011-01-27 20:11+0100\n" -"Last-Translator: Matej Urbančič \n" +"POT-Creation-Date: 2011-02-15 21:16+0000\n" +"PO-Revision-Date: 2011-02-18 13:16+0100\n" +"Last-Translator: Andrej Žnidaršič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: \n" "MIME-Version: 1.0\n" @@ -22,9 +22,10 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" #: ../src/krb5-auth-dialog.xml.h:1 -#: ../src/krb5-auth-dialog.desktop.in.h:2 -msgid "Network Authentication" -msgstr "Overitev omrežja" +#: ../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 msgid "Service Tickets" @@ -48,7 +49,7 @@ msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "Ni mogoče pridobiti vstopnice kerberos: '%s'" #: ../src/ka-pwdialog.c:212 -#: ../src/ka-applet.c:377 +#: ../src/ka-applet.c:359 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" @@ -58,7 +59,7 @@ 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:382 +#: ../src/ka-applet.c:364 msgid "Your credentials have expired" msgstr "Vaša poverila so potekla" @@ -1387,57 +1388,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:371 +#: ../src/ka-applet.c:353 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Vaša poverila potečejo v %.2d%.2dh" -#: ../src/ka-applet.c:506 -msgid "Don't show me this again" -msgstr "Tega ne prikaži več" +#: ../src/ka-applet.c:535 +msgid "List Tickets" +msgstr "Izpiši vstopnice" -#: ../src/ka-applet.c:513 +#: ../src/ka-applet.c:545 msgid "Get Ticket" msgstr "Dobi vstopnico" +#: ../src/ka-applet.c:554 +msgid "Don't show me this again" +msgstr "Tega ne prikaži več" + #: ../src/ka-applet.c:561 +msgid "Remove Credentials Cache" +msgstr "Odstrani predpomnilnik varoval" + +#: ../src/ka-applet.c:609 msgid "You've refreshed your Kerberos credentials." msgstr "Osvežili ste svoja poverila Kerberos" -#: ../src/ka-applet.c:563 +#: ../src/ka-applet.c:611 msgid "Network credentials valid" msgstr "Omrežna varovala so veljavna" -#: ../src/ka-applet.c:582 +#: ../src/ka-applet.c:630 msgid "Network credentials expiring" msgstr "Omrežna varovala bodo potekla" -#: ../src/ka-applet.c:600 +#: ../src/ka-applet.c:648 msgid "Network credentials expired" msgstr "Omrežna varovala so potekla" -#: ../src/ka-applet.c:601 +#: ../src/ka-applet.c:649 msgid "Your Kerberos credentails have expired." msgstr "Vaša varovala Kerberos so potekla." -#: ../src/ka-applet.c:645 +#: ../src/ka-applet.c:692 #, 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:692 +#: ../src/ka-applet.c:739 msgid "translator-credits" msgstr "" "Andrej Žnidaršič\n" "Matej Urbančič" -#: ../src/ka-applet.c:737 +#: ../src/ka-applet.c:784 msgid "Remove Credentials _Cache" msgstr "Odstrani _predpomnilnik varoval" #. Ticket dialog -#: ../src/ka-applet.c:747 +#: ../src/ka-applet.c:794 msgid "_List Tickets" msgstr "_Naštej vstopnice" @@ -1478,7 +1487,7 @@ msgstr "Obnovi" msgid "Error displaying service ticket information" msgstr "Napaka med prikazovanjem podrobnosti storitvene vstopnice" -#: ../src/krb5-auth-dialog.desktop.in.h:1 +#: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Pogovorno okno Kerberos omrežne overitve" @@ -1547,34 +1556,26 @@ msgid "Requested tickets should be renewable" msgstr "Zahtevane vstopnice bi morale biti obnovljive" #: ../src/krb5-auth-dialog.schemas.in.h:17 -msgid "Show a trayicon in the status area of the panel" -msgstr "Prikaz ikone sistemske vrstice v področju stanja na pultu" - -#: ../src/krb5-auth-dialog.schemas.in.h:18 -msgid "Show trayicon" -msgstr "Pokaži ikono sistemske vrstice" - -#: ../src/krb5-auth-dialog.schemas.in.h:19 msgid "Start prompting/displaying notifications that many minutes before expiry" msgstr "Začetek prikazovanja obvestil toliko minut pred potekom" -#: ../src/krb5-auth-dialog.schemas.in.h:20 +#: ../src/krb5-auth-dialog.schemas.in.h:18 msgid "The kerberos principal to acquire the ticket for" msgstr "Kerberos ravnatelj za izdajo vstopnice" -#: ../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 "Ravnateljevo javno/zasebno/potrdilno določilo ob uporabi PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:22 +#: ../src/krb5-auth-dialog.schemas.in.h:20 msgid "ticket expired notification" msgstr "obvestilo potekle vstopnice" -#: ../src/krb5-auth-dialog.schemas.in.h:23 +#: ../src/krb5-auth-dialog.schemas.in.h:21 msgid "ticket expiring notification" msgstr "obvestilo o pretekanju vstopnice" -#: ../src/krb5-auth-dialog.schemas.in.h:24 +#: ../src/krb5-auth-dialog.schemas.in.h:22 msgid "valid ticket notification" msgstr "obvestilo veljavne vstopnice" @@ -1583,10 +1584,6 @@ msgstr "obvestilo veljavne vstopnice" msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "Opozorilo: poganjanje q-agent setuid na tem sistemu je nevarno\n" -#: ../cc-panel/gnome-ka-panel.desktop.in.h:1 -msgid "Kerberos Authentication" -msgstr "Overitev Kerberos" - #. Translators: those are keywords for the example control-center panel #: ../cc-panel/gnome-ka-panel.desktop.in.h:3 msgid "Kerberos;Authentication" @@ -1597,123 +1594,124 @@ msgid "Set your Kerberos network authentication preferences" msgstr "Nastavitev možnosti Kerberos overitve omrežja" #: ../cc-panel/ka-panel.ui.h:1 -msgid "Appearance" -msgstr "Videz" - -#: ../cc-panel/ka-panel.ui.h:2 msgid "Applet" msgstr "Aplet" -#: ../cc-panel/ka-panel.ui.h:3 +#: ../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:4 -msgid "If checked, display the tray icon in the status bar" -msgstr "Izbrana možnost določi prikaz ikone sistemske vrstice v vrstici stanja" - -#: ../cc-panel/ka-panel.ui.h:5 +#: ../cc-panel/ka-panel.ui.h:3 msgid "If checked, request forwardable tickets" msgstr "Izbrana možnost določi zahtevo za uporabo prenosljivih vstopnic" -#: ../cc-panel/ka-panel.ui.h:6 +#: ../cc-panel/ka-panel.ui.h:4 msgid "If checked, request proxiable tickets" msgstr "Izbrana možnost omogoči zahtevo za posredovalno vstopnico" -#: ../cc-panel/ka-panel.ui.h:7 +#: ../cc-panel/ka-panel.ui.h:5 msgid "If checked, request renewable tickets" msgstr "Izbrana možnost določi zahtevo za uporabo obnovljivih vstopnic" -#: ../cc-panel/ka-panel.ui.h:8 +#: ../cc-panel/ka-panel.ui.h:6 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:9 +#: ../cc-panel/ka-panel.ui.h:7 msgid "Kerberos" msgstr "Kerberos" -#: ../cc-panel/ka-panel.ui.h:10 +#: ../cc-panel/ka-panel.ui.h:8 msgid "Kerberos User" msgstr "Uporabnik Kerberos" -#: ../cc-panel/ka-panel.ui.h:11 +#: ../cc-panel/ka-panel.ui.h:9 msgid "Kerberos principal:" msgstr "Kerberos ravnatelj:" -#: ../cc-panel/ka-panel.ui.h:12 +#: ../cc-panel/ka-panel.ui.h:10 msgid "Notifications" msgstr "Obvestila" -#: ../cc-panel/ka-panel.ui.h:13 +#: ../cc-panel/ka-panel.ui.h:11 msgid "PKINIT:" msgstr "PKINIT:" -#: ../cc-panel/ka-panel.ui.h:14 +#: ../cc-panel/ka-panel.ui.h:12 msgid "Requested Kerberos tickets should be:" msgstr "Zahtevane vstopnice Kerberos bi morale biti:" -#: ../cc-panel/ka-panel.ui.h:15 +#: ../cc-panel/ka-panel.ui.h:13 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:16 -msgid "Show tray icon" -msgstr "Pokaži ikono sistemske vrstice" - -#: ../cc-panel/ka-panel.ui.h:17 +#: ../cc-panel/ka-panel.ui.h:14 msgid "Ticket Options" msgstr "Možnosti vstopnice" -#: ../cc-panel/ka-panel.ui.h:18 +#: ../cc-panel/ka-panel.ui.h:15 msgid "Use Smartcard" msgstr "Uporabi SmartCard" -#: ../cc-panel/ka-panel.ui.h:19 +#: ../cc-panel/ka-panel.ui.h:16 msgid "Userid:" msgstr "Uporabniški ID:" #. Used in combination: 'Warn x minutes before expiry' -#: ../cc-panel/ka-panel.ui.h:21 +#: ../cc-panel/ka-panel.ui.h:18 msgid "Warn" msgstr "Opozori" -#: ../cc-panel/ka-panel.ui.h:22 +#: ../cc-panel/ka-panel.ui.h:19 msgid "X509 trust anchors:" msgstr "X509 zaupna sidra:" -#: ../cc-panel/ka-panel.ui.h:23 +#: ../cc-panel/ka-panel.ui.h:20 msgid "_Browse..." msgstr "_Prebrskaj ..." -#: ../cc-panel/ka-panel.ui.h:24 +#: ../cc-panel/ka-panel.ui.h:21 msgid "forwardable" msgstr "prenosljiva" #. Used in combination: 'Warn x minutes before expiry' -#: ../cc-panel/ka-panel.ui.h:26 +#: ../cc-panel/ka-panel.ui.h:23 msgid "minutes before expiry" msgstr "minut pred iztekom" -#: ../cc-panel/ka-panel.ui.h:27 +#: ../cc-panel/ka-panel.ui.h:24 msgid "proxiable" msgstr "posredovana" -#: ../cc-panel/ka-panel.ui.h:28 +#: ../cc-panel/ka-panel.ui.h:25 msgid "renewable" msgstr "obnovljiva" -#: ../cc-panel/cc-ka-panel.c:346 +#: ../cc-panel/cc-ka-panel.c:345 msgid "Choose Certificate" msgstr "Izbor potrdila" -#: ../cc-panel/cc-ka-panel.c:362 +#: ../cc-panel/cc-ka-panel.c:361 msgid "X509 Certificates" msgstr "X509 potrdila" -#: ../cc-panel/cc-ka-panel.c:366 +#: ../cc-panel/cc-ka-panel.c:365 msgid "all files" msgstr "vse datoteke" +#~ msgid "Network Authentication" +#~ msgstr "Overitev omrežja" +#~ msgid "Show a trayicon in the status area of the panel" +#~ msgstr "Prikaz ikone sistemske vrstice v področju stanja na pultu" +#~ msgid "Show trayicon" +#~ msgstr "Pokaži ikono sistemske vrstice" +#~ msgid "Appearance" +#~ msgstr "Videz" +#~ msgid "If checked, display the tray icon in the status bar" +#~ msgstr "" +#~ "Izbrana možnost določi prikaz ikone sistemske vrstice v vrstici stanja" +#~ msgid "Show tray icon" +#~ msgstr "Pokaži ikono sistemske vrstice" #~ msgid "" #~ "There was an error displaying %s:\n" #~ "%s" diff --git a/po/sv.po b/po/sv.po index b3992d0..8cf15fe 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,66 +1,83 @@ # Swedish translation for krb5-auth-dialog. -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the krb5-auth-dialog package. -# Daniel Nylander , 2009. +# Daniel Nylander , 2009, 2011. # msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-14 11:42+0200\n" -"PO-Revision-Date: 2009-06-14 11:47+0100\n" +"POT-Creation-Date: 2011-02-15 22:01+0100\n" +"PO-Revision-Date: 2011-02-15 22:15+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" +"Language: sv\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" #: ../src/krb5-auth-dialog.xml.h:1 -#: ../src/krb5-auth-dialog.c:53 -#: ../src/krb5-auth-dialog.desktop.in.h:2 -#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:1 -msgid "Network Authentication" -msgstr "Nätverksautentisering" +#: ../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 +msgid "Service Tickets" +msgstr "" + +#: ../src/krb5-auth-dialog.xml.h:3 msgid "_Renew Ticket" msgstr "" -#: ../src/krb5-auth-dialog.c:820 +#: ../src/ka-dialog.c:171 +msgid "unknown error" +msgstr "okänt fel" + +#: ../src/ka-dialog.c:332 +msgid "Expired" +msgstr "" + +#: ../src/ka-pwdialog.c:175 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "" -#: ../src/krb5-auth-pwdialog.c:173 -#: ../src/krb5-auth-applet.c:358 +#: ../src/ka-pwdialog.c:212 +#: ../src/ka-applet.c:359 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" msgstr[0] "" msgstr[1] "" -#: ../src/krb5-auth-pwdialog.c:178 -#: ../src/krb5-auth-applet.c:363 +#: ../src/ka-pwdialog.c:217 +#: ../src/ka-applet.c:364 msgid "Your credentials have expired" msgstr "" -#: ../src/krb5-auth-pwdialog.c:199 +#: ../src/ka-pwdialog.c:237 msgid "Please enter your Kerberos password:" msgstr "Ange ditt Kerberos-lösenord:" -#: ../src/krb5-auth-pwdialog.c:210 +#: ../src/ka-pwdialog.c:248 #, c-format msgid "Please enter the password for '%s':" msgstr "Ange lösenordet för \"%s\":" -#: ../src/krb5-auth-pwdialog.c:230 +#: ../src/ka-pwdialog.c:263 msgid "The password you entered is invalid" msgstr "Lösenordet som du angav är ogiltigt" +#: ../src/ka-pwdialog.c:279 +#, c-format +msgid "%s Error" +msgstr "%s fel" + #. 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" @@ -74,7 +91,7 @@ msgstr "" #. asn1_err.et:asn1:ASN1_MISSING_FIELD #: ../src/dummy-strings.c:12 msgid "ASN.1 unexpected field number" -msgstr "" +msgstr "ASN.1 oväntat fältnummer" #. asn1_err.et:asn1:ASN1_MISPLACED_FIELD #: ../src/dummy-strings.c:13 @@ -84,7 +101,7 @@ msgstr "" #. asn1_err.et:asn1:ASN1_TYPE_MISMATCH #: ../src/dummy-strings.c:14 msgid "ASN.1 value too large" -msgstr "" +msgstr "ASN.1 värdet är för stort" #. asn1_err.et:asn1:ASN1_OVERFLOW #: ../src/dummy-strings.c:15 @@ -109,7 +126,7 @@ msgstr "" #. asn1_err.et:asn1:ASN1_BAD_FORMAT #: ../src/dummy-strings.c:19 msgid "ASN.1 parse error" -msgstr "" +msgstr "ASN.1 tolkningsfel" #. asn1_err.et:asn1:ASN1_PARSE_ERROR #: ../src/dummy-strings.c:20 @@ -159,12 +176,12 @@ msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_S_OLD_MAST_KVNO #: ../src/dummy-strings.c:29 msgid "Client not found in Kerberos database" -msgstr "" +msgstr "Klienten hittades inte i Kerberos-databasen" #. krb5_err.et:krb5:KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN #: ../src/dummy-strings.c:30 msgid "Server not found in Kerberos database" -msgstr "" +msgstr "Servern hittades inte i Kerberos-databasen" #. krb5_err.et:krb5:KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN #: ../src/dummy-strings.c:31 @@ -199,7 +216,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_BADOPTION #: ../src/dummy-strings.c:37 msgid "KDC has no support for encryption type" -msgstr "" +msgstr "KDC saknar stöd för krypteringstypen" #. krb5_err.et:krb5:KRB5KDC_ERR_ETYPE_NOSUPP #: ../src/dummy-strings.c:38 @@ -304,7 +321,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_SKEW #: ../src/dummy-strings.c:58 msgid "Incorrect net address" -msgstr "" +msgstr "Felaktig nätadress" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADADDR #: ../src/dummy-strings.c:59 @@ -314,7 +331,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADVERSION #: ../src/dummy-strings.c:60 msgid "Invalid message type" -msgstr "" +msgstr "Ogiltig meddelandetyp" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_MSG_TYPE #: ../src/dummy-strings.c:61 @@ -334,12 +351,12 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_ILL_CR_TKT #: ../src/dummy-strings.c:64 msgid "Key version is not available" -msgstr "" +msgstr "Nyckelversionen är inte tillgänglig" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADKEYVER #: ../src/dummy-strings.c:65 msgid "Service key not available" -msgstr "" +msgstr "Tjänstenyckeln är inte tillgänglig" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOKEY #. krb5_err.et:krb5:KRB5_NO_LOCALNAME @@ -361,7 +378,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_METHOD #: ../src/dummy-strings.c:69 msgid "Incorrect sequence number in message" -msgstr "" +msgstr "Felaktigt sekvensnummer i meddelandet" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADSEQ #: ../src/dummy-strings.c:70 @@ -376,7 +393,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_PATH_NOT_ACCEPTED #: ../src/dummy-strings.c:72 msgid "Response too big for UDP, retry with TCP" -msgstr "" +msgstr "Svaret är för stort för UDP, försöker med TCP" #. krb5_err.et:krb5:KRB5KRB_ERR_RESPONSE_TOO_BIG #: ../src/dummy-strings.c:73 @@ -391,12 +408,12 @@ msgstr "Fältet är för långt för denna implementation" #. krb5_err.et:krb5:KRB5KRB_ERR_FIELD_TOOLONG #: ../src/dummy-strings.c:75 msgid "Client not trusted" -msgstr "" +msgstr "Klienten är inte pålitlig" #. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NOT_TRUSTED #: ../src/dummy-strings.c:76 msgid "KDC not trusted" -msgstr "" +msgstr "KDC är inte pålitlig" #. krb5_err.et:krb5:KRB5KDC_ERR_KDC_NOT_TRUSTED #: ../src/dummy-strings.c:77 @@ -431,12 +448,12 @@ msgstr "Spärrat certifikat" #. krb5_err.et:krb5:KRB5KDC_ERR_REVOKED_CERTIFICATE #: ../src/dummy-strings.c:83 msgid "Revocation status unknown" -msgstr "" +msgstr "Spärrstatus är okänd" #. krb5_err.et:krb5:KRB5KDC_ERR_REVOCATION_STATUS_UNKNOWN #: ../src/dummy-strings.c:84 msgid "Revocation status unavailable" -msgstr "" +msgstr "Spärrstatus är inte tillgänglig" #. krb5_err.et:krb5:KRB5KDC_ERR_REVOCATION_STATUS_UNAVAILABLE #: ../src/dummy-strings.c:85 @@ -446,7 +463,7 @@ msgstr "Klientnamnet stämmer inte" #. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NAME_MISMATCH #: ../src/dummy-strings.c:86 msgid "KDC name mismatch" -msgstr "" +msgstr "KDC-namnet stämmer inte" #. krb5_err.et:krb5:KRB5KDC_ERR_KDC_NAME_MISMATCH #: ../src/dummy-strings.c:87 @@ -461,7 +478,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED #: ../src/dummy-strings.c:89 msgid "Checksum must be included" -msgstr "" +msgstr "Kontrollsumman måste inkluderas" #. krb5_err.et:krb5:KRB5KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED #: ../src/dummy-strings.c:90 @@ -471,7 +488,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED #: ../src/dummy-strings.c:91 msgid "Public key encryption not supported" -msgstr "" +msgstr "Kryptering med publik nyckel stöds inte" #. krb5_err.et:krb5:KRB5KDC_ERR_PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED #: ../src/dummy-strings.c:92 @@ -496,12 +513,12 @@ msgstr "Lösenorden stämmer inte" #. krb5_err.et:krb5:KRB5_LIBOS_BADPWDMATCH #: ../src/dummy-strings.c:96 msgid "Password read interrupted" -msgstr "" +msgstr "Lösenordsläsningen avbröts" #. krb5_err.et:krb5:KRB5_LIBOS_PWDINTR #: ../src/dummy-strings.c:97 msgid "Illegal character in component name" -msgstr "" +msgstr "Otillåtet tecken i komponentnamnet" #. krb5_err.et:krb5:KRB5_PARSE_ILLCHAR #: ../src/dummy-strings.c:98 @@ -511,7 +528,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_PARSE_MALFORMED #: ../src/dummy-strings.c:99 msgid "Can't open/find Kerberos configuration file" -msgstr "" +msgstr "Kan inte öppna/hitta konfigurationfil för Kerberos" #. krb5_err.et:krb5:KRB5_CONFIG_CANTOPEN #: ../src/dummy-strings.c:100 @@ -611,7 +628,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_REALM_UNKNOWN #: ../src/dummy-strings.c:119 msgid "Kerberos service unknown" -msgstr "" +msgstr "Kerberos-tjänsten är okänd" #. krb5_err.et:krb5:KRB5_SERVICE_UNKNOWN #: ../src/dummy-strings.c:120 @@ -761,17 +778,17 @@ msgstr "" #. krb5_err.et:krb5:KRB5_NO_TKT_IN_RLM #: ../src/dummy-strings.c:150 msgid "DES key has bad parity" -msgstr "" +msgstr "DES-nyckeln har dålig paritet" #. krb5_err.et:krb5:KRB5DES_BAD_KEYPAR #: ../src/dummy-strings.c:151 msgid "DES key is a weak key" -msgstr "" +msgstr "DES-nyckeln är en svag nyckel" #. krb5_err.et:krb5:KRB5DES_WEAK_KEY #: ../src/dummy-strings.c:152 msgid "Bad encryption type" -msgstr "" +msgstr "Dålig krypteringstyp" #. krb5_err.et:krb5:KRB5_BAD_ENCTYPE #: ../src/dummy-strings.c:153 @@ -901,7 +918,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_KEYTAB_BADVNO #: ../src/dummy-strings.c:178 msgid "Program lacks support for address type" -msgstr "" +msgstr "Programmet saknar stöd för adresstypen" #. krb5_err.et:krb5:KRB5_PROG_ATYPE_NOSUPP #: ../src/dummy-strings.c:179 @@ -996,12 +1013,12 @@ msgstr "" #. krb5_err.et:krb5:KRB5_LIB_EXPIRED #: ../src/dummy-strings.c:197 msgid "New password cannot be zero length" -msgstr "" +msgstr "Nytt lösenord får inte vara noll tecken långt" #. krb5_err.et:krb5:KRB5_CHPW_PWDNULL #: ../src/dummy-strings.c:198 msgid "Password change failed" -msgstr "" +msgstr "Ändring av lösenord misslyckades" #. krb5_err.et:krb5:KRB5_CHPW_FAIL #: ../src/dummy-strings.c:199 @@ -1011,7 +1028,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_KT_FORMAT #: ../src/dummy-strings.c:200 msgid "Encryption type not permitted" -msgstr "" +msgstr "Krypteringstypen tillåts inte" #. krb5_err.et:krb5:KRB5_NOPERM_ETYPE #: ../src/dummy-strings.c:201 @@ -1021,12 +1038,12 @@ msgstr "" #. krb5_err.et:krb5:KRB5_CONFIG_ETYPE_NOSUPP #: ../src/dummy-strings.c:202 msgid "Program called an obsolete, deleted function" -msgstr "" +msgstr "Programmet anropade en föråldrad, borttagen funktion" #. krb5_err.et:krb5:KRB5_OBSOLETE_FN #: ../src/dummy-strings.c:203 msgid "unknown getaddrinfo failure" -msgstr "" +msgstr "okänt getaddrinfo-fel" #. krb5_err.et:krb5:KRB5_EAI_FAIL #: ../src/dummy-strings.c:204 @@ -1036,12 +1053,12 @@ msgstr "" #. krb5_err.et:krb5:KRB5_EAI_NODATA #: ../src/dummy-strings.c:205 msgid "host/domain name not found" -msgstr "" +msgstr "värd-/domännamnet hittades inte" #. krb5_err.et:krb5:KRB5_EAI_NONAME #: ../src/dummy-strings.c:206 msgid "service name unknown" -msgstr "" +msgstr "tjänstenamnet är okänt" #. krb5_err.et:krb5:KRB5_EAI_SERVICE #: ../src/dummy-strings.c:207 @@ -1365,44 +1382,54 @@ msgstr "" msgid "Bad magic number for GSSAPI QUEUE" msgstr "" -#. Translators: First number is hours, second number is minutes -#: ../src/krb5-auth-applet.c:354 +#: ../src/ka-applet.c:353 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "" -#: ../src/krb5-auth-applet.c:450 +#: ../src/ka-applet.c:535 +msgid "List Tickets" +msgstr "" + +#: ../src/ka-applet.c:545 +msgid "Get Ticket" +msgstr "" + +#: ../src/ka-applet.c:554 msgid "Don't show me this again" msgstr "Visa inte detta igen" -#: ../src/krb5-auth-applet.c:487 -msgid "Network credentials valid" +#: ../src/ka-applet.c:561 +msgid "Remove Credentials Cache" msgstr "" -#: ../src/krb5-auth-applet.c:488 +#: ../src/ka-applet.c:609 msgid "You've refreshed your Kerberos credentials." msgstr "" -#: ../src/krb5-auth-applet.c:501 +#: ../src/ka-applet.c:611 +msgid "Network credentials valid" +msgstr "" + +#: ../src/ka-applet.c:630 msgid "Network credentials expiring" msgstr "" -#: ../src/krb5-auth-applet.c:516 +#: ../src/ka-applet.c:648 msgid "Network credentials expired" msgstr "" -#: ../src/krb5-auth-applet.c:517 +#: ../src/ka-applet.c:649 msgid "Your Kerberos credentails have expired." msgstr "" -#: ../src/krb5-auth-applet.c:581 +#: ../src/ka-applet.c:692 #, c-format -msgid "" -"There was an error displaying %s:\n" -"%s" +msgid "There was an error launching the preferences dialog: %s" msgstr "" -#: ../src/krb5-auth-applet.c:616 +#. Translators: add the translators of your language here +#: ../src/ka-applet.c:739 msgid "translator-credits" msgstr "" "Daniel Nylander \n" @@ -1410,84 +1437,118 @@ msgstr "" "Skicka synpunkter på översättningen till\n" "." -#. kdestroy -#: ../src/krb5-auth-applet.c:651 +#: ../src/ka-applet.c:784 msgid "Remove Credentials _Cache" msgstr "" -#: ../src/krb5-auth-tools.c:45 +#. Ticket dialog +#: ../src/ka-applet.c:794 +msgid "_List Tickets" +msgstr "" + +#: ../src/ka-tools.c:45 #, c-format msgid "" "There was an error displaying help:\n" "%s" msgstr "" +"Det uppstod ett fel vid visning av hjälp:\n" +"%s" -#: ../src/krb5-auth-dialog.desktop.in.h:1 +#: ../src/ka-tickets.c:54 +msgid "Principal" +msgstr "" + +#: ../src/ka-tickets.c:60 +msgid "Start Time" +msgstr "Starttid" + +#: ../src/ka-tickets.c:66 +msgid "End Time" +msgstr "Sluttid" + +#: ../src/ka-tickets.c:72 +msgid "Fwd" +msgstr "" + +#: ../src/ka-tickets.c:78 +msgid "Proxy" +msgstr "" + +#: ../src/ka-tickets.c:84 +msgid "Renew" +msgstr "" + +#: ../src/ka-tickets.c:107 +msgid "Error displaying service ticket information" +msgstr "" + +#: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:1 -msgid "Forwardable ticket" +msgid "Enabled plugins" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:2 -msgid "Kerberos principal" +msgid "Forwardable ticket" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:3 -msgid "Notify user when ticket becomes valid" +msgid "Kerberos principal" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:4 -msgid "Notify user when ticket has expired" +msgid "List of plugins that should be loaded and activated on startup." msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:5 -msgid "Notify user when ticket is about to expire" +msgid "Notify user when ticket becomes valid" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:6 -msgid "PKINIT CA certificates" +msgid "Notify user when ticket has expired" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:7 -msgid "PKINIT identifier" +msgid "Notify user when ticket is about to expire" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:8 -msgid "PKINIT trust anchors" +msgid "PKINIT CA certificates" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:9 -msgid "Prompt minutes before expiry" +msgid "PKINIT identifier" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:10 -msgid "Proxiable ticket" +msgid "PKINIT trust anchors" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:11 -msgid "Renewable ticket" +msgid "Prompt minutes before expiry" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:12 -msgid "Requested tickets should be forwardable" +msgid "Proxiable ticket" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:13 -msgid "Requested tickets should be proxiable" +msgid "Renewable ticket" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:14 -msgid "Requested tickets should be renewable" +msgid "Requested tickets should be forwardable" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:15 -msgid "Show a trayicon in the status area of the panel" +msgid "Requested tickets should be proxiable" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:16 -msgid "Show trayicon" +msgid "Requested tickets should be renewable" msgstr "" #: ../src/krb5-auth-dialog.schemas.in.h:17 @@ -1514,183 +1575,132 @@ msgstr "" msgid "valid ticket notification" msgstr "" -#: ../gtksecentry/gtksecentry.c:454 -msgid "Cursor Position" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:456 -msgid "The current position of the insertion cursor in chars" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:463 -msgid "Selection Bound" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:465 -msgid "The position of the opposite end of the selection from the cursor in chars" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:472 -msgid "Maximum length" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:474 -msgid "Maximum number of characters for this entry. Zero if no maximum" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:482 -msgid "Has Frame" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:484 -msgid "FALSE removes outside bevel from entry" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:493 -msgid "Invisible character" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:495 -msgid "The character to use when masking entry contents (in \"password mode\")" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:504 -msgid "Activates default" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:506 -msgid "Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:511 -msgid "Width in chars" -msgstr "Bredd i tecken" - -#: ../gtksecentry/gtksecentry.c:513 -msgid "Number of characters to leave space for in the entry" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:521 -msgid "Scroll offset" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:523 -msgid "Number of pixels of the entry scrolled off the screen to the left" -msgstr "" - -#: ../gtksecentry/gtksecentry.c:530 -msgid "Text" -msgstr "Text" - -#: ../gtksecentry/gtksecentry.c:532 -msgid "The contents of the entry" -msgstr "" - #: ../secmem/util.c:106 #, c-format msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:2 +#. 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" + +#: ../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" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:2 +#: ../cc-panel/ka-panel.ui.h:1 msgid "Applet" -msgstr "" +msgstr "Panelprogram" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:3 -msgid "If checked, display the tray icon in the status bar" -msgstr "" +#: ../cc-panel/ka-panel.ui.h:2 +msgid "Certificate and private key used for authentication" +msgstr "Certifikat och privat nyckel som används för autentisering" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:4 +#: ../cc-panel/ka-panel.ui.h:3 msgid "If checked, request forwardable tickets" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:5 +#: ../cc-panel/ka-panel.ui.h:4 msgid "If checked, request proxiable tickets" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:6 +#: ../cc-panel/ka-panel.ui.h:5 msgid "If checked, request renewable tickets" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:7 +#: ../cc-panel/ka-panel.ui.h:6 +msgid "If checked, use a security token (Smartcard) to authenticate." +msgstr "" + +#: ../cc-panel/ka-panel.ui.h:7 msgid "Kerberos" msgstr "Kerberos" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:8 -msgid "Kerberos Authentication Configuration" -msgstr "" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:9 +#: ../cc-panel/ka-panel.ui.h:8 msgid "Kerberos User" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:10 +#: ../cc-panel/ka-panel.ui.h:9 msgid "Kerberos principal:" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:11 +#: ../cc-panel/ka-panel.ui.h:10 msgid "Notifications" msgstr "Notifieringar" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:12 -msgid "PKINIT anchors:" -msgstr "" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:13 -msgid "PKINIT userid:" -msgstr "" - -#: ../preferences/krb5-auth-dialog-preferences.xml.h:14 -msgid "Path to CA certificates used as trust anchors for PKINIT" +#: ../cc-panel/ka-panel.ui.h:11 +msgid "PKINIT:" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:15 +#: ../cc-panel/ka-panel.ui.h:12 msgid "Requested Kerberos tickets should be:" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:16 +#: ../cc-panel/ka-panel.ui.h:13 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:14 +msgid "Ticket Options" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:18 -msgid "The principal's public/private/certificate identifier. Leave empty if not using PKINIT." -msgstr "" +#: ../cc-panel/ka-panel.ui.h:15 +msgid "Use Smartcard" +msgstr "Använd smartkort" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:19 -msgid "Ticket Options" +#: ../cc-panel/ka-panel.ui.h:16 +msgid "Userid:" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:20 +#. Used in combination: 'Warn x minutes before expiry' +#: ../cc-panel/ka-panel.ui.h:18 msgid "Warn" msgstr "Varna" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:21 +#: ../cc-panel/ka-panel.ui.h:19 +msgid "X509 trust anchors:" +msgstr "" + +#: ../cc-panel/ka-panel.ui.h:20 +msgid "_Browse..." +msgstr "_Bläddra..." + +#: ../cc-panel/ka-panel.ui.h:21 msgid "forwardable" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:22 +#. Used in combination: 'Warn x minutes before expiry' +#: ../cc-panel/ka-panel.ui.h:23 msgid "minutes before expiry" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:23 +#: ../cc-panel/ka-panel.ui.h:24 msgid "proxiable" msgstr "" -#: ../preferences/krb5-auth-dialog-preferences.xml.h:24 +#: ../cc-panel/ka-panel.ui.h:25 msgid "renewable" msgstr "" +#: ../cc-panel/cc-ka-panel.c:345 +msgid "Choose Certificate" +msgstr "Välj certifikat" + +#: ../cc-panel/cc-ka-panel.c:361 +msgid "X509 Certificates" +msgstr "X509-certifikat" + +#: ../cc-panel/cc-ka-panel.c:365 +msgid "all files" +msgstr "alla filer" + +#~ msgid "Appearance" +#~ msgstr "Utseende" +#~ msgid "Width in chars" +#~ msgstr "Bredd i tecken" +#~ msgid "Text" +#~ msgstr "Text" #~ msgid "_About" #~ msgstr "_Om" #~ msgid "_Quit" diff --git a/src/Makefile.am b/src/Makefile.am index 1c89d31..fb64219 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,7 +105,7 @@ AM_CPPFLAGS = \ pkgdatadir = $(datadir)/krb5-auth-dialog pkgdata_DATA = \ - krb5-auth-dialog.xml \ + krb5-auth-dialog.ui \ $(NULL) EXTRA_DIST = \ diff --git a/src/Makefile.in b/src/Makefile.in index 612e7c4..12cb8fa 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -409,7 +409,7 @@ AM_CPPFLAGS = \ $(NULL) pkgdata_DATA = \ - krb5-auth-dialog.xml \ + krb5-auth-dialog.ui \ $(NULL) EXTRA_DIST = \ diff --git a/src/ka-applet.c b/src/ka-applet.c index b2b2823..7de9204 100644 --- a/src/ka-applet.c +++ b/src/ka-applet.c @@ -950,21 +950,31 @@ ka_ns_check_persistence (KaApplet *self) { GList *caps; GList *l; + gboolean is_autostart = g_getenv("DESKTOP_AUTOSTART_ID") ? TRUE : FALSE; + gint seconds = 5; self->priv->ns_persistence = FALSE; - caps = notify_get_server_caps (); - if (caps == NULL) { + do { + caps = notify_get_server_caps (); + if (caps == NULL) g_warning ("Failed to read server caps"); - return; - } - - l = g_list_find_custom (caps, "persistence", (GCompareFunc)strcmp); - if (l != NULL) { - self->priv->ns_persistence = TRUE; - KA_DEBUG ("Notification server supports persistence."); - } - g_list_foreach (caps, (GFunc) g_free, NULL); - g_list_free (caps); + else { + l = g_list_find_custom (caps, "persistence", (GCompareFunc)strcmp); + if (l != NULL) { + self->priv->ns_persistence = TRUE; + KA_DEBUG ("Notification server supports persistence."); + } + g_list_foreach (caps, (GFunc) g_free, NULL); + g_list_free (caps); + } + /* During session start we have to wait until the shell is fully up + * to reliably detect the persistence property (#642666) */ + if (is_autostart && !self->priv->ns_persistence) { + sleep(1); + seconds--; + } else + break; + } while (seconds); } @@ -989,7 +999,7 @@ ka_applet_create () applet->priv->uixml = gtk_builder_new (); ret = gtk_builder_add_from_file (applet->priv->uixml, KA_DATA_DIR G_DIR_SEPARATOR_S - PACKAGE ".xml", &error); + PACKAGE ".ui", &error); if (!ret) { g_assert (error); g_assert (error->message); diff --git a/src/ka-dialog.c b/src/ka-dialog.c index ce86367..3114f49 100644 --- a/src/ka-dialog.c +++ b/src/ka-dialog.c @@ -502,6 +502,15 @@ credentials_expiring (gpointer *data) } +/* run once, then terminate the timer */ +static gboolean +credentials_expiring_once (gpointer *data) +{ + credentials_expiring(data); + return FALSE; +} + + /* * set ticket options by looking at krb5.conf and gconf */ @@ -1056,9 +1065,10 @@ main (int argc, char *argv[]) const char *help_msg = "Run '" PACKAGE " --help' to see a full list of available command line options"; const GOptionEntry options [] = { {"auto", 'a', 0, G_OPTION_ARG_NONE, &run_auto, - "Only run if an initialized ccache is found (default)", NULL}, + "Only run if an initialized ccache is found", NULL}, + /* accepted for compatibility only */ {"always", 'A', 0, G_OPTION_ARG_NONE, &run_always, - "Always run", NULL}, + "Always run (default)", NULL}, { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } }; GFileMonitor *monitor = NULL; @@ -1085,10 +1095,7 @@ main (int argc, char *argv[]) if (!ka_dbus_connect (&status)) exit(status); - if (run_always && !run_auto) { - always_run = TRUE; - } - + always_run = !run_auto; if (using_krb5 () || always_run) { g_set_application_name (KA_NAME); @@ -1098,6 +1105,7 @@ main (int argc, char *argv[]) ka_nm_init(); g_timeout_add_seconds (CREDENTIAL_CHECK_INTERVAL, (GSourceFunc)credentials_expiring, applet); + g_idle_add ((GSourceFunc)credentials_expiring_once, applet); monitor = monitor_ccache (applet); ka_dbus_service(applet); diff --git a/src/krb5-auth-dialog.ui b/src/krb5-auth-dialog.ui new file mode 100644 index 0000000..f36f537 --- /dev/null +++ b/src/krb5-auth-dialog.ui @@ -0,0 +1,216 @@ + + + + + + 6 + Kerberos Authentication + False + center-always + dialog + + + True + + + True + 6 + 12 + + + True + 0 + krb-valid-ticket + 6 + + + False + 0 + + + + + True + 10 + + + True + 12 + + + True + + + True + 0 + True + + + False + False + 0 + + + + + 0 + + + + + True + 3 + + + True + 3 + + + + + + 0 + + + + + True + 1 + <span size="smaller"> </span> + True + + + False + False + 1 + + + + + 1 + + + + + + + 1 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + _Renew Ticket + True + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + krb5_renew_button + + + + 5 + Service Tickets + False + normal + + + True + vertical + 2 + + + True + vertical + + + True + True + + + 0 + + + + + 1 + + + + + True + end + + + + + + gtk-close + True + True + True + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + krb5_tickets_ok + + + diff --git a/src/krb5-auth-dialog.xml b/src/krb5-auth-dialog.xml deleted file mode 100644 index f36f537..0000000 --- a/src/krb5-auth-dialog.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - 6 - Kerberos Authentication - False - center-always - dialog - - - True - - - True - 6 - 12 - - - True - 0 - krb-valid-ticket - 6 - - - False - 0 - - - - - True - 10 - - - True - 12 - - - True - - - True - 0 - True - - - False - False - 0 - - - - - 0 - - - - - True - 3 - - - True - 3 - - - - - - 0 - - - - - True - 1 - <span size="smaller"> </span> - True - - - False - False - 1 - - - - - 1 - - - - - - - 1 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - _Renew Ticket - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - cancelbutton1 - krb5_renew_button - - - - 5 - Service Tickets - False - normal - - - True - vertical - 2 - - - True - vertical - - - True - True - - - 0 - - - - - 1 - - - - - True - end - - - - - - gtk-close - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - krb5_tickets_ok - - - -- cgit