From 808ce78d212c6b434d24066f1f2d44d3e76224ae Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sat, 11 Nov 2017 14:21:02 +0100 Subject: New upstream version 3.26.0 --- ChangeLog | 1289 +++++++++------ INSTALL | 320 ++-- Makefile.in | 17 +- aclocal.m4 | 121 +- config.guess | 28 +- config.h.in | 11 + config.sub | 22 +- configure | 2931 ++++++++++++++++++----------------- configure.ac | 8 +- depcomp | 6 +- etpo/Makefile.in | 5 +- etpo/lexer.c | 125 +- examples/Makefile.in | 5 +- help/Makefile.am | 2 +- help/Makefile.in | 7 +- help/pl/index.docbook | 341 ++++ help/pl/legal.xml | 16 + help/pl/pl.po | 667 ++++++++ help/pl/pl.stamp | 0 icons/22x22/Makefile.in | 5 +- icons/48x48/Makefile.in | 5 +- icons/Makefile.in | 5 +- icons/scalable/Makefile.in | 5 +- krb5-auth-dialog.spec | 2 +- ltmain.sh | 4 +- plugins/Makefile.in | 5 +- po/Makefile.in.in | 11 +- po/cs.po | 29 +- po/da.po | 318 ++-- po/de.po | 70 +- po/es.po | 39 +- po/fr.po | 375 +++-- po/hu.po | 22 +- po/nb.po | 2 +- po/pa.po | 1 + po/pl.po | 158 +- po/pt_BR.po | 172 +- po/sl.po | 2 +- po/sr.po | 34 +- po/sr@latin.po | 34 +- po/sv.po | 30 +- po/uk.po | 1 + po/zh_HK.po | 1 + po/zh_TW.po | 1 + secmem/Makefile.in | 5 +- secmem/secmem.c | 2 +- src/Makefile.in | 5 +- src/ka-applet.c | 20 +- src/ka-kerberos.c | 64 +- src/ka-main-window.c | 32 + src/ka-pwdialog.c | 76 +- src/ka-tools.c | 5 +- src/ka-tools.h | 2 +- src/krb5-auth-dialog.1.in | 7 +- src/krb5-auth-dialog.appdata.xml.in | 21 +- src/resources.c | 288 ++-- src/resources/ui/ka-main-window.ui | 18 +- ylwrap | 6 +- 58 files changed, 4821 insertions(+), 2982 deletions(-) create mode 100644 help/pl/index.docbook create mode 100644 help/pl/legal.xml create mode 100644 help/pl/pl.po create mode 100644 help/pl/pl.stamp diff --git a/ChangeLog b/ChangeLog index 40571d8..7d5e929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,456 @@ # Generated by Makefile. Do not edit. +commit fafdbcb7f61970470b4df095ce5bc2dfa9a626b7 +Author: Guido Günther +Date: Sat Nov 11 12:44:12 2017 +0100 + + Release 3.26.0 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2384bf0bd668a17dca6733dc63bdb8c1f1960bf9 +Author: Guido Günther +Date: Sun Jul 16 19:16:04 2017 +0200 + + Avoid warning when building with MIT Kerberos + + Heimdal uses a long int for timestamps + + src/ka-kerberos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2691467aa5c4caccc894fbf11a2da27918d413db +Author: Guido Günther +Date: Sun Jul 16 19:16:04 2017 +0200 + + Avoid warning when building with MIT Kerberos + + Heimdal uses a size_t + + src/ka-kerberos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5aaa0459dc05386a7456d6aea2eb90e4ff83e0db +Author: Guido Günther +Date: Sun Jul 16 19:16:04 2017 +0200 + + Don't assume there is a file when listing tickets + + Instead of checking for the the existence of an actual file + use the Kerberos error code. This allows us to work for other + cache types too. + + src/ka-kerberos.c | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) + +commit 188a6bd32940db46a0fadd56860d9acecee96c39 +Author: Guido Günther +Date: Thu Jul 13 18:34:50 2017 +0200 + + Set pwdialog transient to the main window + + Now that both can appear on the screen at the same time. + + src/ka-applet.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 073c8432c6eb5849daffe841c56cdbefe29274d8 +Author: Guido Günther +Date: Fri Jul 7 16:19:27 2017 +0200 + + Add button to refresh credentials to main window's header bar + + Useful if one closes the notifiation + + src/ka-main-window.c | 32 ++++++++++++++++++++++++++++++++ + src/resources/ui/ka-main-window.ui | 18 ++++++++++++++++-- + 2 files changed, 48 insertions(+), 2 deletions(-) + +commit b2da1f9ef7ed6ade542dc105ac1185436faf3db7 +Author: Guido Günther +Date: Fri Jul 7 11:22:33 2017 +0200 + + Improve description of --auto + + Thanks: Daniel Richard G. + + src/krb5-auth-dialog.1.in | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 9c14e9701e61e4a78315e25e6dbd1b3809bf53f5 +Author: Guido Günther +Date: Fri Jul 7 09:25:13 2017 +0200 + + Don't try to destroy context menu if it's not initialized + + src/ka-applet.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 23ba826890d60c3c556a8d1a021e97b8d3fb416c +Author: Guido Günther +Date: Fri Jul 7 09:10:37 2017 +0200 + + credentials_expiring_real: check if kcontext is valid + + othewise we might crash when the credentials_expiring_once fires but + we're already shutting down. + + Reference: https://bugs.launchpad.net/bugs/1700468 + + src/ka-kerberos.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit d935d296b0c6c36b88e55627ce675cd82e765a44 +Author: Guido Günther +Date: Fri Jul 7 08:56:10 2017 +0200 + + Don't use non-ascii character + + secmem/secmem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 43bf01e5c31c4c6d9b9640f3d660f3959b01aabf +Author: Guido Günther +Date: Fri Jul 7 08:44:21 2017 +0200 + + Drop parameter + + src/ka-kerberos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 381d597c1a41655312226369796eb5572e601b70 +Author: Guido Günther +Date: Thu Jun 8 19:48:54 2017 +0200 + + Ignore emacs temp files + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 6f119c14fca38d2113eced50cd4373de14dce946 +Author: Guido Günther +Date: Thu Jun 8 19:48:17 2017 +0200 + + Ignore files generated for help + + .gitignore | 3 +++ + 1 file changed, 3 insertions(+) + +commit fd163687db141c527ae5b477b1388a361555a768 +Author: Guido Günther +Date: Thu Jun 8 19:46:45 2017 +0200 + + Ignore cscope files + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 99bcfa4e24e577dae3fa7338362b20cfc15bf4c8 +Author: Guido Günther +Date: Thu Jun 8 19:43:40 2017 +0200 + + Use gtk_show_uri_on_window + + instead of deprecated gtk_show_uri + + src/ka-applet.c | 2 +- + src/ka-tools.c | 5 ++--- + src/ka-tools.h | 2 +- + 3 files changed, 4 insertions(+), 5 deletions(-) + +commit 2d77bb8ab3f030120842445be752c65f744c4b41 +Author: Guido Günther +Date: Wed Jun 7 19:58:19 2017 +0200 + + Use gdk_grab_seat + + instead of deprecated gdk_device_grab + + src/ka-pwdialog.c | 76 +++++++++++++------------------------------------------ + 1 file changed, 18 insertions(+), 58 deletions(-) + +commit 69a40e67d788a8c8c7644414091bfa69a69a9a80 +Author: Piotr Drąg +Date: Sun Jun 4 18:24:04 2017 +0200 + + Add Polish help translation + + help/Makefile.am | 2 +- + help/pl/pl.po | 667 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 668 insertions(+), 1 deletion(-) + +commit f12760386094af148c6b16d4616a67700af19a61 +Author: Мирослав Николић +Date: Sun Feb 26 09:18:30 2017 +0100 + + Updated Serbian translation + + po/sr.po | 26 ++++++++++++++++++++------ + po/sr@latin.po | 26 ++++++++++++++++++++------ + 2 files changed, 40 insertions(+), 12 deletions(-) + +commit 4af8b6fce2e450d885fffe4f01332564a26fc7c2 +Author: Anders Jonsson +Date: Wed Feb 1 18:08:13 2017 +0000 + + Update Swedish translation + + po/sv.po | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 653d38cfa1be312692e000fca97d18e83fb21eb9 +Author: Piotr Drąg +Date: Sat Jan 28 01:20:52 2017 +0100 + + Fix a translator comment + + They need to be exactly one line above a string to show up in .po files. + + src/ka-applet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 14d7a8ca50e1b55178637c4d02e9f419295f72ce +Author: Guido Günther +Date: Sat Jan 14 19:16:21 2017 +0100 + + Use libnm only + + Requires network-manager 1.0 released December 2014. + + configure.ac | 4 +--- + src/ka-kerberos.c | 24 +----------------------- + 2 files changed, 2 insertions(+), 26 deletions(-) + +commit 49e9e86abac0640f534065d6a6a617cba3046a50 +Author: Lubomir Rintel +Date: Thu Jan 12 15:39:41 2017 +0100 + + Port to libnm + + It's the perferred NetworkManager's library for a couple of years now + already. Keep compatibility with the older one, since it's reasonably + similar. + + Signed-off-by: Guido Günther + + configure.ac | 8 ++++++-- + src/ka-kerberos.c | 37 ++++++++++++++++++++++++++----------- + 2 files changed, 32 insertions(+), 13 deletions(-) + +commit 870a1c889c8014d2a0a042fd6eba173d1e1ece7e +Author: Lubomir Rintel +Date: Thu Jan 12 15:39:42 2017 +0100 + + Fix accidental Python + + Signed-off-by: Guido Günther + + src/ka-kerberos.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b18aa99d779f1a85cd1675bd722c276beec9e2b1 +Author: Rafael Fontenelle +Date: Wed Dec 28 19:10:53 2016 +0000 + + Update Brazilian Portuguese translation + + po/pt_BR.po | 172 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 93 insertions(+), 79 deletions(-) + +commit 6b8049b9681803f9c318bc910553a4ef03b499ff +Author: Daniel Mustieles +Date: Thu Dec 22 20:18:40 2016 +0100 + + Updated Spanish translation + + po/es.po | 26 ++++++++++++++++++++------ + 1 file changed, 20 insertions(+), 6 deletions(-) + +commit 4f2ed10895caf777e727edba9178910d30ece09f +Author: Joe Hansen +Date: Sun Dec 4 14:54:57 2016 +0100 + + Updated Danish translation + + po/da.po | 318 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 183 insertions(+), 135 deletions(-) + +commit 0c0f1762f379275df0fe16c9f4526d175f1c5241 +Author: Christian Kirbach +Date: Fri Nov 4 21:27:34 2016 +0000 + + Update German translation + + po/de.po | 63 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 37 insertions(+), 26 deletions(-) + +commit a3c2d5c0de6b3451e6a3726229bb939d94a733cc +Author: Anders Jonsson +Date: Thu Oct 20 21:49:29 2016 +0000 + + Update Swedish translation + + po/sv.po | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +commit 0825391456d3bd74dba9822b9afe99f96f10cc79 +Author: Gábor Kelemen +Date: Wed Oct 19 03:26:31 2016 +0000 + + Update Hungarian translation + + po/hu.po | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +commit b08320b19cf7fe08a3061b4450623fcf01acffb0 +Author: Piotr Drąg +Date: Sun Oct 9 08:35:49 2016 +0200 + + Update Polish translation + + po/pl.po | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +commit 2eca4701df6657af35762ecbdfbcb058bcdaa337 +Author: Zdeněk Hataš +Date: Thu Oct 6 10:38:00 2016 +0200 + + Updated Czech translation + + po/cs.po | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit df75d64baf7afdf8e0c1d6d1c2806b2b9c435b34 +Author: Piotr Drąg +Date: Tue Oct 4 21:46:33 2016 +0200 + + Mark missing strings in the AppData file for translation + + src/krb5-auth-dialog.appdata.xml.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c6380a518b958e4ef8801ba7bd87b20c003da25e +Author: Zdeněk Hataš +Date: Tue Oct 4 14:37:36 2016 +0200 + + Updated Czech translation + + po/cs.po | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit c6fa60cedc22f795e3eea2cc29411b059aa4a56c +Author: Balázs Meskó +Date: Tue Oct 4 11:00:44 2016 +0000 + + Updated Hungarian translation + + po/hu.po | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 19cb5dfa905e7f50b3eb5e485206c939a3cfbe3f +Author: Guido Günther +Date: Tue Oct 4 08:12:40 2016 +0200 + + Update appdata fields + + src/krb5-auth-dialog.appdata.xml.in | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +commit a6be6072d3028b5d13c4f4c33daf62b452b2f1cb +Author: Debarshi Ray +Date: Mon Oct 3 19:33:17 2016 +0200 + + typo: credentails -> credentials + + https://bugzilla.gnome.org/show_bug.cgi?id=772374 + + src/ka-applet.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 912087762d611cb65f7f1c042af15b610e60b6dd +Author: Daniel Mustieles +Date: Tue Sep 13 20:21:19 2016 +0200 + + Updated Spanish translation + + po/es.po | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit fa890bf046f1a0b4c16220c23c9ed847d2af1751 +Author: Piotr Drąg +Date: Fri Sep 9 04:15:16 2016 +0200 + + Updated Polish translation + + po/pl.po | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 8447a24963ef6cad4a9692d3f680576ecb7cf8c0 +Author: Claude Paroz +Date: Mon Sep 5 19:03:51 2016 +0200 + + Updated French translation + + po/fr.po | 374 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 214 insertions(+), 160 deletions(-) + +commit b462d0be841445e772d89fe498b387dd22aa421c +Author: Piotr Drąg +Date: Sun Aug 21 15:19:44 2016 +0200 + + Updated Polish translation + + po/pl.po | 134 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 65 insertions(+), 69 deletions(-) + +commit 09ba4d112a38fd8ccf8fb5fe16715c5dd39d5e1e +Author: Zdeněk Hataš +Date: Sun Aug 21 10:45:43 2016 +0200 + + Updated Czech translation + + po/cs.po | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit 1070a722b0ccea2381e000740ec4d68c67d3e42b +Author: Мирослав Николић +Date: Sat Aug 20 23:08:41 2016 +0200 + + Updated Serbian translation + + po/sr.po | 16 ++++++++++------ + po/sr@latin.po | 18 +++++++++++------- + 2 files changed, 21 insertions(+), 13 deletions(-) + +commit 8167d0057a30458550223757f7de9e4569db0679 +Author: Mario Blättermann +Date: Thu Aug 4 11:10:30 2016 +0000 + + Updated German translation + + po/de.po | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 7b91d198229d72775f0fcefbda2596c145cef79a +Author: Piotr Drąg +Date: Sat Jul 23 22:43:43 2016 +0200 + + Add Language headers to po files + + Future versions of gettext will fail if this header is missing. + + po/es.po | 2 +- + po/fr.po | 1 + + po/nb.po | 2 +- + po/pa.po | 1 + + po/sl.po | 2 +- + po/sr@latin.po | 2 +- + po/uk.po | 1 + + po/zh_HK.po | 1 + + po/zh_TW.po | 1 + + 9 files changed, 9 insertions(+), 4 deletions(-) + commit eb60762b8dbbc1da4ddd827383687927af80c4f3 Author: Guido Günther Date: Thu Jul 21 13:05:56 2016 +0200 @@ -34,8 +485,8 @@ Date: Tue May 31 22:30:09 2016 +0000 Updated Swedish translation - help/sv/sv.po | 847 +++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 604 insertions(+), 243 deletions(-) + help/sv/sv.po | 815 ++++++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 588 insertions(+), 227 deletions(-) commit e2c746d4d2d39167d81abb2c1211debe2976ef90 Author: Josef Andersson @@ -107,8 +558,8 @@ Date: Wed Mar 23 08:19:02 2016 +0000 Updated Greek translation - po/el.po | 289 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 148 insertions(+), 141 deletions(-) + po/el.po | 285 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 146 insertions(+), 139 deletions(-) commit 6bd8ba1f232b84ab927a483ff6ad62bd057d4920 Author: Γιάννης Κουτσούκος @@ -116,8 +567,8 @@ Date: Wed Mar 23 08:18:38 2016 +0000 Updated Greek translation - help/el/el.po | 521 +++++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 338 insertions(+), 183 deletions(-) + help/el/el.po | 517 ++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 336 insertions(+), 181 deletions(-) commit cd24d2624973fab825425409d6209aa6e067b051 Author: Mario Blättermann @@ -125,8 +576,8 @@ Date: Tue Mar 22 11:00:48 2016 +0100 Updated German doc translation - help/de/de.po | 448 ++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 277 insertions(+), 171 deletions(-) + help/de/de.po | 444 ++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 275 insertions(+), 169 deletions(-) commit d4d7811ddf4d801cf38f62ec6e504c50be57a17f Author: Necdet Yücel @@ -144,8 +595,8 @@ Date: Fri Mar 18 06:51:28 2016 +0000 Updated Brazilian Portuguese translation - po/pt_BR.po | 288 +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 148 insertions(+), 140 deletions(-) + po/pt_BR.po | 284 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 146 insertions(+), 138 deletions(-) commit 36890046705daf84daa1058e54c035e02d3d5dd6 Author: Mario Blättermann @@ -153,8 +604,8 @@ Date: Mon Jan 4 20:02:27 2016 +0100 Updated German translation - po/de.po | 608 ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 326 insertions(+), 282 deletions(-) + po/de.po | 578 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 311 insertions(+), 267 deletions(-) commit c85a5f5b67e78ca8758534ccf769ef22b5ef37ee Author: Мирослав Николић @@ -162,9 +613,9 @@ Date: Wed Dec 30 12:24:42 2015 +0100 Updated Serbian translation - po/sr.po | 290 ++++++++++++++++++++++++++++----------------------------- - po/sr@latin.po | 290 ++++++++++++++++++++++++++++----------------------------- - 2 files changed, 288 insertions(+), 292 deletions(-) + po/sr.po | 286 ++++++++++++++++++++++++++++----------------------------- + po/sr@latin.po | 286 ++++++++++++++++++++++++++++----------------------------- + 2 files changed, 284 insertions(+), 288 deletions(-) commit 047a15b2cc90524a07b5ca85fcb67046156025b3 Author: Guido Günther @@ -183,8 +634,8 @@ Date: Thu Nov 12 12:56:24 2015 +0800 Update zh_CN translation - po/zh_CN.po | 286 +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 147 insertions(+), 139 deletions(-) + po/zh_CN.po | 282 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 145 insertions(+), 137 deletions(-) commit 363b920e923e45bfa9af4181cc7a995a4aa4bd08 Author: Pedro Albuquerque @@ -230,8 +681,8 @@ Date: Sat Jun 20 09:04:31 2015 +0200 Updated Czech translation - po/cs.po | 282 +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 140 insertions(+), 142 deletions(-) + po/cs.po | 278 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 138 insertions(+), 140 deletions(-) commit 23eb6c28c5368b73a1684b86134eabbb955d82c9 Author: Guido Günther @@ -272,8 +723,8 @@ Date: Sun Mar 15 21:52:35 2015 +0000 Updated Swedish translation - po/sv.po | 536 ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 289 insertions(+), 247 deletions(-) + po/sv.po | 496 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 269 insertions(+), 227 deletions(-) commit 644be16362c9f760f27b9b6a9e3b85eb3171af1c Author: Samir Ribic @@ -291,8 +742,8 @@ Date: Mon Jan 19 01:55:41 2015 +0100 Updated Czech translation - help/cs/cs.po | 540 +++++++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 366 insertions(+), 174 deletions(-) + help/cs/cs.po | 560 +++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 376 insertions(+), 184 deletions(-) commit 35a58fe687d8b4d4805ae26d4dfb15c9ebc7f7d1 Author: David King @@ -302,17 +753,16 @@ Date: Fri Jan 16 13:36:27 2015 +0000 https://bugzilla.gnome.org/show_bug.cgi?id=743038 - Makefile.am | 4 - - acinclude.m4 | 2 +- - configure.ac | 2 +- - help/C/index.docbook | 370 +++++++++++++++++++++++++++++++++++++++++++ - help/C/krb5-auth-dialog.xml | 370 ------------------------------------------- - help/Makefile.am | 16 +- - help/krb5-auth-dialog.omf.in | 37 ----- - m4/gnome-doc-utils.m4 | 53 ------- - m4/yelp.m4 | 213 +++++++++++++++++++++++++ - src/ka-tools.c | 2 +- - 10 files changed, 594 insertions(+), 475 deletions(-) + Makefile.am | 4 - + acinclude.m4 | 2 +- + configure.ac | 2 +- + help/C/{krb5-auth-dialog.xml => index.docbook} | 0 + help/Makefile.am | 16 +- + help/krb5-auth-dialog.omf.in | 37 ----- + m4/gnome-doc-utils.m4 | 53 ------ + m4/yelp.m4 | 213 +++++++++++++++++++++++++ + src/ka-tools.c | 2 +- + 9 files changed, 224 insertions(+), 105 deletions(-) commit 67b6eebbe3446209711bbe1a6e21787f95cf71b3 Author: David King @@ -649,10 +1099,10 @@ Date: Fri Oct 24 13:56:16 2014 +0200 This gives us variants with and without header bar for free. src/ka-applet.c | 9 +- - src/ka-preferences.c | 513 ++++++++++++++++++++++--------------- + src/ka-preferences.c | 501 ++++++++++++++++++++++--------------- src/ka-preferences.h | 25 +- src/resources/ui/ka-preferences.ui | 6 +- - 4 files changed, 341 insertions(+), 212 deletions(-) + 4 files changed, 335 insertions(+), 206 deletions(-) commit 8d3e1c9103e7837132eaeffc7736799e2fc95e77 Author: Guido Günther @@ -901,8 +1351,8 @@ Date: Thu Jun 19 19:58:59 2014 +0200 to be consistent with other gnome apps - src/krb5-auth-dialog.ui | 78 +++++++++++++++++++++---------------------------- - 1 file changed, 34 insertions(+), 44 deletions(-) + src/krb5-auth-dialog.ui | 72 +++++++++++++++++++++---------------------------- + 1 file changed, 31 insertions(+), 41 deletions(-) commit d3c917a84b3c2e26fe58b8131923b9fa9455a9ba Author: MarMav @@ -1105,8 +1555,8 @@ Date: Fri Sep 13 22:12:56 2013 +0200 Updated Danish translation - po/da.po | 515 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 265 insertions(+), 250 deletions(-) + po/da.po | 509 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 262 insertions(+), 247 deletions(-) commit bcac5ee442c282b92f8c455b66566f29efe93b79 Author: Fran Diéguez @@ -1198,8 +1648,8 @@ Date: Tue Apr 2 00:35:52 2013 +0800 Update Simplified Chinese translation - po/zh_CN.po | 538 ++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 285 insertions(+), 253 deletions(-) + po/zh_CN.po | 532 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 282 insertions(+), 250 deletions(-) commit 37df9b921bf989102c7a77f46827cdc9b1d1fd23 Author: Marek Černocký @@ -1234,8 +1684,8 @@ Date: Fri Mar 29 23:15:40 2013 +0100 Updated Slovenian translation - po/sl.po | 138 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 71 insertions(+), 67 deletions(-) + po/sl.po | 134 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 69 insertions(+), 65 deletions(-) commit bfacebdfcbaf8928acabb39306684f02c0363894 Author: Daniel Mustieles @@ -1393,20 +1843,19 @@ Date: Mon Feb 20 21:54:30 2012 +0100 src/Makefile.am | 27 +- src/ka-applet-priv.h | 11 +- src/ka-applet.c | 77 +++--- - src/ka-gconf-tools.c | 149 ----------- + src/ka-gconf-tools.c | 149 ---------- src/ka-gconf-tools.h | 48 ---- - src/ka-gconf.c | 195 -------------- - src/ka-gconf.h | 29 -- + src/ka-gconf.c | 195 ------------- src/ka-kerberos.c | 2 +- src/ka-plugin-loader.c | 27 +- - src/ka-preferences.c | 453 +++++++++++--------------------- + src/ka-preferences.c | 467 +++++++++++--------------------- src/ka-preferences.h | 2 + src/ka-settings.c | 58 ++++ - src/ka-settings.h | 43 +++ + src/{ka-gconf.h => ka-settings.h} | 18 +- src/krb5-auth-dialog.schemas.in | 146 ---------- src/org.gnome.KrbAuthDialog.convert | 13 + src/org.gnome.KrbAuthDialog.gschema.xml | 65 +++++ - 21 files changed, 456 insertions(+), 958 deletions(-) + 20 files changed, 436 insertions(+), 938 deletions(-) commit 50451b28716e74612152511af44771f761b61c49 Author: Guido Günther @@ -1462,8 +1911,8 @@ Date: Sun Feb 10 00:05:01 2013 -0200 Updated Brazilian Portuguese translation - po/pt_BR.po | 562 ++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 304 insertions(+), 258 deletions(-) + po/pt_BR.po | 552 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 299 insertions(+), 253 deletions(-) commit 5510e8b0c8a2e905842962ef059b7e01a6fae24a Author: Marek Černocký @@ -1489,8 +1938,8 @@ Date: Fri Nov 9 12:04:12 2012 +0100 Updated Czech translation - po/cs.po | 339 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 172 insertions(+), 167 deletions(-) + po/cs.po | 319 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 162 insertions(+), 157 deletions(-) commit 1bbe1eec409d0b9df58c41bcc9296276ed71eb42 Author: Daniel Winzen @@ -1525,8 +1974,8 @@ Date: Sun Jun 3 00:17:29 2012 +0200 Updated French translation - po/fr.po | 323 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 163 insertions(+), 160 deletions(-) + po/fr.po | 313 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 158 insertions(+), 155 deletions(-) commit 9109ec49c77b1daa2d9d9b85440bdbc8da1607c1 Author: Matej Urbančič @@ -1534,8 +1983,8 @@ Date: Mon May 28 14:58:41 2012 +0200 Updated Slovenian translation - po/sl.po | 299 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 151 insertions(+), 148 deletions(-) + po/sl.po | 289 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 146 insertions(+), 143 deletions(-) commit 86a06ecad9849a4ca5508cf7cfdbcede89cdf15d Author: Daniel Mustieles @@ -1543,8 +1992,8 @@ Date: Sun May 27 12:30:05 2012 +0200 Updated Spanish translation - po/es.po | 454 +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 227 insertions(+), 227 deletions(-) + po/es.po | 446 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 223 insertions(+), 223 deletions(-) commit 771275702e1802b7150b9903c8ad915f604cc746 Author: Antoine Jacoutot @@ -1563,8 +2012,8 @@ Date: Sat Mar 24 00:12:35 2012 +0100 Updated Galician translations - po/gl.po | 470 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 242 insertions(+), 228 deletions(-) + po/gl.po | 460 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 237 insertions(+), 223 deletions(-) commit f7414096623e564d9d26794b7cc1cb3ab680929d Author: Guido Günther @@ -1701,8 +2150,8 @@ Date: Mon Sep 12 12:23:13 2011 +0200 since GtkApplication is 3.0 only - configure.ac | 30 +++++------------------------- - 1 file changed, 5 insertions(+), 25 deletions(-) + configure.ac | 32 ++++++-------------------------- + 1 file changed, 6 insertions(+), 26 deletions(-) commit d8efe4a8fe5152f8c53c005fb0830ef80fce8a9d Author: Guido Günther @@ -1721,18 +2170,16 @@ Date: Mon Sep 12 10:51:06 2011 +0200 We finally moved the startup code out there. - configure.ac | 2 +- - po/POTFILES.in | 2 +- - src/Makefile.am | 4 +- - src/ka-applet.c | 2 +- - src/ka-dbus.c | 2 +- - src/ka-dialog.c | 1110 -------------------------------------------------- - src/ka-dialog.h | 35 -- - src/ka-kerberos.c | 1110 ++++++++++++++++++++++++++++++++++++++++++++++++++ - src/ka-kerberos.h | 35 ++ - src/ka-main-window.c | 2 +- - src/ka-pwdialog.c | 2 +- - 11 files changed, 1153 insertions(+), 1153 deletions(-) + configure.ac | 2 +- + po/POTFILES.in | 2 +- + src/Makefile.am | 4 ++-- + src/ka-applet.c | 2 +- + src/ka-dbus.c | 2 +- + src/{ka-dialog.c => ka-kerberos.c} | 2 +- + src/{ka-dialog.h => ka-kerberos.h} | 0 + src/ka-main-window.c | 2 +- + src/ka-pwdialog.c | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) commit 9b3059c3b60f586d344d06cc3227ee9b7bee1bb6 Author: Guido Günther @@ -1894,8 +2341,8 @@ Date: Sun Sep 4 19:05:08 2011 +0200 src/ka-main-window.c | 64 +++++++++++++-- src/ka-main-window.h | 2 +- - src/krb5-auth-dialog.ui | 213 +++++++++++++++++++++++++++++++++++++----------- - 3 files changed, 227 insertions(+), 52 deletions(-) + src/krb5-auth-dialog.ui | 211 +++++++++++++++++++++++++++++++++++++----------- + 3 files changed, 226 insertions(+), 51 deletions(-) commit 88d1f28b5aa86aba5cf4d46f719fe2ca5c9f1040 Author: Guido Günther @@ -1930,16 +2377,14 @@ Date: Sun Sep 4 15:31:44 2011 +0200 instead of a dialog - po/POTFILES.in | 2 +- - src/Makefile.am | 4 +- - src/ka-applet.c | 10 ++-- - src/ka-dialog.c | 2 +- - src/ka-main-window.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/ka-main-window.h | 40 ++++++++++++++++ - src/ka-tickets.c | 116 --------------------------------------------- - src/ka-tickets.h | 39 --------------- - src/krb5-auth-dialog.ui | 61 +++++------------------- - 9 files changed, 184 insertions(+), 213 deletions(-) + po/POTFILES.in | 2 +- + src/Makefile.am | 4 +-- + src/ka-applet.c | 10 +++--- + src/ka-dialog.c | 2 +- + src/{ka-tickets.c => ka-main-window.c} | 35 +++++++++++-------- + src/{ka-tickets.h => ka-main-window.h} | 5 +-- + src/krb5-auth-dialog.ui | 61 +++++++--------------------------- + 7 files changed, 45 insertions(+), 74 deletions(-) commit 371720a2b70b968dfcaaf5b7de0d0826c985a050 Author: Guido Günther @@ -1983,8 +2428,8 @@ Date: Fri Jun 10 15:52:51 2011 +0200 Update Czech translation by Zdenek Hatas - po/cs.po | 351 ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 189 insertions(+), 162 deletions(-) + po/cs.po | 347 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 187 insertions(+), 160 deletions(-) commit 2b27db7f8d18d7d6d473a1efd093a1fe0e646981 Author: Guido Günther @@ -2016,8 +2461,8 @@ Date: Thu Apr 21 17:36:17 2011 +0200 Updated French translation - po/fr.po | 126 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 76 insertions(+), 50 deletions(-) + po/fr.po | 122 ++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 74 insertions(+), 48 deletions(-) commit e75b2be5f1f8a6d1410a6ea5c37217c9e29513c1 Author: Joe Hansen @@ -2025,8 +2470,8 @@ Date: Wed Apr 6 22:33:14 2011 +0200 Updated Danish translation - po/da.po | 128 ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 77 insertions(+), 51 deletions(-) + po/da.po | 126 ++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 76 insertions(+), 50 deletions(-) commit 46edaee71f066bc961e319e0d589a15d44f97192 Author: Matej Urbančič @@ -2144,8 +2589,8 @@ Date: Tue Mar 29 16:16:32 2011 +0200 Updated Slovenian translation - po/sl.po | 160 ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 87 insertions(+), 73 deletions(-) + po/sl.po | 158 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 86 insertions(+), 72 deletions(-) commit 9cf49075f942fb0ae67685458bedca8ef0449912 Author: Kjartan Maraas @@ -2153,8 +2598,8 @@ Date: Mon Mar 28 20:39:34 2011 +0200 Updated Norwegian bokmål translation - po/nb.po | 262 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 133 insertions(+), 129 deletions(-) + po/nb.po | 260 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 132 insertions(+), 128 deletions(-) commit 378378f939868df01669042d1a5f8e1541950b10 Author: Daniel Mustieles @@ -2352,11 +2797,11 @@ Date: Fri Feb 25 23:09:22 2011 +0100 src/Makefile.am | 14 --- src/ka-applet-priv.h | 5 + src/ka-applet.c | 28 ++++-- - src/ka-dbus.c | 247 ++++++++++++++++++++++++++++++++++++------------ + src/ka-dbus.c | 249 ++++++++++++++++++++++++++++++++++++------------ src/ka-dbus.h | 12 +-- src/ka-dbus.xml | 30 ------ src/ka-dialog.c | 15 ++- - 11 files changed, 233 insertions(+), 139 deletions(-) + 11 files changed, 234 insertions(+), 140 deletions(-) commit d7fb06fed1ef841e854ede85980c9e5d6544e868 Author: Guido Günther @@ -2365,14 +2810,14 @@ Date: Thu Feb 24 21:59:36 2011 +0100 Reindent according to CodingStyle CodingStyle | 5 +- - src/ka-dbus.c | 126 +++-- + src/ka-dbus.c | 134 +++-- src/ka-dbus.h | 12 +- - src/ka-dialog.c | 1399 ++++++++++++++++++++++++++--------------------------- - src/ka-pwdialog.c | 381 ++++++++------- + src/ka-dialog.c | 1509 ++++++++++++++++++++++++++--------------------------- + src/ka-pwdialog.c | 403 +++++++------- src/ka-pwdialog.h | 21 +- src/ka-tickets.c | 147 +++--- src/ka-tickets.h | 18 +- - 8 files changed, 1062 insertions(+), 1047 deletions(-) + 8 files changed, 1132 insertions(+), 1117 deletions(-) commit 345521f0e3bd7e3ba0b9975da9db70702aec60e4 Author: Guido Günther @@ -2433,12 +2878,11 @@ 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(-) + po/POTFILES.in | 2 +- + src/Makefile.am | 2 +- + src/ka-applet.c | 2 +- + src/{krb5-auth-dialog.xml => krb5-auth-dialog.ui} | 0 + 4 files changed, 3 insertions(+), 3 deletions(-) commit 286054dfc9dabd0fa10d229ae1c71a9f2dd40326 Author: Andrej Žnidaršič @@ -2455,8 +2899,8 @@ Date: Tue Feb 15 22:16:17 2011 +0100 Updated Swedish translation - po/sv.po | 420 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 215 insertions(+), 205 deletions(-) + po/sv.po | 416 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 213 insertions(+), 203 deletions(-) commit 88acc9ee38f59eaf5800e49cd94c767d5dafdbc8 Author: Daniel Mustieles @@ -2591,8 +3035,8 @@ Date: Sat Feb 12 16:39:50 2011 +0100 BZ: #633420 configure.ac | 3 +- - src/ka-applet.c | 197 +++++++++++++++++++++++++++++++++++++++----------------- - 2 files changed, 141 insertions(+), 59 deletions(-) + src/ka-applet.c | 195 +++++++++++++++++++++++++++++++++++++++----------------- + 2 files changed, 140 insertions(+), 58 deletions(-) commit 61e967ec63309dc3a1629f140c4f63c5186e3b8c Author: Guido Günther @@ -2614,10 +3058,10 @@ Date: Fri Feb 11 17:06:52 2011 +0100 that simply pops up a dialog. Libnotify supports persistent notifications for this now. - configure.ac | 43 +++++++++---------------------------------- + configure.ac | 45 ++++++++++----------------------------------- src/ka-applet.c | 16 ---------------- src/ka-dialog.c | 32 +++++--------------------------- - 3 files changed, 14 insertions(+), 77 deletions(-) + 3 files changed, 15 insertions(+), 78 deletions(-) commit 68f52116adfe4b014cb8c4e2e146b377e71a5f3f Author: Matej Urbančič @@ -2804,8 +3248,8 @@ Date: Wed Oct 13 15:21:55 2010 +0300 Updated Ukrainian translation - po/uk.po | 163 +++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 91 insertions(+), 72 deletions(-) + po/uk.po | 161 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 90 insertions(+), 71 deletions(-) commit 93f214594009fef14339c8e97e1b2e2c7d5ca9df Author: Andrej Žnidaršič @@ -2904,8 +3348,8 @@ Date: Tue Oct 5 12:52:35 2010 +0200 Reindent - src/ka-applet.c | 1273 +++++++++++++++++++++++++++---------------------------- - 1 file changed, 634 insertions(+), 639 deletions(-) + src/ka-applet.c | 1313 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 654 insertions(+), 659 deletions(-) commit b780009127e58ced43eb49e6f8f6e00a114c59c3 Author: Guido Günther @@ -2925,8 +3369,8 @@ Date: Thu Sep 30 09:30:23 2010 +0200 instead of the deprecated libnm_glib_* functions - src/ka-dialog.c | 80 ++++++++++++++++++++++++++++----------------------------- - 1 file changed, 39 insertions(+), 41 deletions(-) + src/ka-dialog.c | 82 ++++++++++++++++++++++++++++----------------------------- + 1 file changed, 40 insertions(+), 42 deletions(-) commit 174d4d3582a6b36b94b7b282a805440b76a017e3 Author: Mario Blättermann @@ -2934,8 +3378,8 @@ Date: Wed Sep 22 21:48:14 2010 +0200 [i18n] Updated German doc translation - help/de/de.po | 228 ++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 143 insertions(+), 85 deletions(-) + help/de/de.po | 232 ++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 145 insertions(+), 87 deletions(-) commit 7c9386dbac2fee761a09044158c8cdccd742310a Author: Guido Günther @@ -3004,8 +3448,8 @@ Date: Thu Jul 29 12:24:44 2010 +0200 to select the GTK+ version used. Code taken from gtk-vnc. - configure.ac | 37 +++++++++++++++++++++++++++++-------- - 1 file changed, 29 insertions(+), 8 deletions(-) + configure.ac | 41 +++++++++++++++++++++++++++++++---------- + 1 file changed, 31 insertions(+), 10 deletions(-) commit 45f476929622b14a210dd8c6b493506a4f2889a9 Author: Jorge González @@ -3064,11 +3508,11 @@ Date: Wed Jul 7 17:28:12 2010 +0200 Reindent plugins - plugins/ka-plugin-dummy.c | 65 +++++++++++++++++------------------ + plugins/ka-plugin-dummy.c | 67 +++++++++++++++++------------------- plugins/ka-plugin-dummy.h | 13 ++----- - plugins/ka-plugin-pam.c | 86 +++++++++++++++++++++++------------------------ - plugins/ka-plugin-pam.h | 15 ++------- - 4 files changed, 80 insertions(+), 99 deletions(-) + plugins/ka-plugin-pam.c | 88 +++++++++++++++++++++++------------------------ + plugins/ka-plugin-pam.h | 15 ++------ + 4 files changed, 82 insertions(+), 101 deletions(-) commit e8232134f1ced866a56270ef4dc36fe29480c97d Author: Guido Günther @@ -3191,8 +3635,8 @@ Date: Sun Jun 6 17:59:12 2010 +0200 Update nb translation - po/nb.po | 1009 ++++++++++++++++++++++++++++---------------------------------- - 1 file changed, 457 insertions(+), 552 deletions(-) + po/nb.po | 995 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 450 insertions(+), 545 deletions(-) commit 7a7832ce3a7c4adffca663fd5298ac76a47abf27 Author: Guido Günther @@ -3400,20 +3844,18 @@ Date: Wed Apr 28 17:48:14 2010 +0200 Rename krb5-auth-applet.h to ka-applet-priv.h since these parts shouldn't be used by modules. - src/Makefile.am | 4 +- - src/ka-applet-priv.h | 72 ++++ - src/ka-applet.c | 942 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/ka-dbus.c | 2 +- - src/ka-dbus.h | 2 +- - src/ka-dialog.c | 2 +- - src/ka-dialog.h | 2 +- - src/ka-gconf.c | 2 +- - src/ka-gconf.h | 2 +- - src/ka-plugin-loader.c | 2 +- - src/ka-pwdialog.c | 2 +- - src/krb5-auth-applet.c | 943 ------------------------------------------------- - src/krb5-auth-applet.h | 70 ---- - 13 files changed, 1024 insertions(+), 1023 deletions(-) + src/Makefile.am | 4 ++-- + src/{krb5-auth-applet.h => ka-applet-priv.h} | 4 +++- + src/{krb5-auth-applet.c => ka-applet.c} | 7 +++---- + src/ka-dbus.c | 2 +- + src/ka-dbus.h | 2 +- + src/ka-dialog.c | 2 +- + src/ka-dialog.h | 2 +- + src/ka-gconf.c | 2 +- + src/ka-gconf.h | 2 +- + src/ka-plugin-loader.c | 2 +- + src/ka-pwdialog.c | 2 +- + 11 files changed, 16 insertions(+), 15 deletions(-) commit 8ddcf3681b8a9a06a50b570497d9d49562cf9cfb Author: Guido Günther @@ -3423,18 +3865,16 @@ Date: Wed Apr 28 17:45:06 2010 +0200 krb5-auth-dialog rename fix - autogen.sh | 2 +- - configure.ac | 2 +- - src/Makefile.am | 4 +- - src/ka-dbus.c | 2 +- - src/ka-dialog.c | 1171 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/ka-dialog.h | 32 ++ - src/ka-pwdialog.c | 2 +- - src/ka-tickets.c | 2 +- - src/krb5-auth-applet.c | 2 +- - src/krb5-auth-dialog.c | 1171 ------------------------------------------------ - src/krb5-auth-dialog.h | 33 -- - 11 files changed, 1211 insertions(+), 1212 deletions(-) + autogen.sh | 2 +- + configure.ac | 2 +- + src/Makefile.am | 4 ++-- + src/ka-dbus.c | 2 +- + src/{krb5-auth-dialog.c => ka-dialog.c} | 8 ++++---- + src/{krb5-auth-dialog.h => ka-dialog.h} | 1 - + src/ka-pwdialog.c | 2 +- + src/ka-tickets.c | 2 +- + src/krb5-auth-applet.c | 2 +- + 9 files changed, 12 insertions(+), 13 deletions(-) commit 01f5263f9eb76a11fb1c1207a323973e3b7c5efe Author: Guido Günther @@ -3442,12 +3882,11 @@ Date: Wed Apr 28 17:35:28 2010 +0200 Reneme krb5-auth-applet-dbus.xml to ka-dbus.xml - src/.gitignore | 2 +- - src/Makefile.am | 8 ++++---- - src/ka-dbus.c | 2 +- - src/ka-dbus.xml | 30 ++++++++++++++++++++++++++++++ - src/krb5-auth-applet-dbus.xml | 31 ------------------------------- - 5 files changed, 36 insertions(+), 37 deletions(-) + src/.gitignore | 2 +- + src/Makefile.am | 8 ++++---- + src/ka-dbus.c | 2 +- + src/{krb5-auth-applet-dbus.xml => ka-dbus.xml} | 1 - + 4 files changed, 6 insertions(+), 7 deletions(-) commit 26cfffab3ee5795c6216c31dd8030958fb20a01c Author: Guido Günther @@ -3455,14 +3894,12 @@ Date: Wed Apr 28 17:30:13 2010 +0200 Rename krb5-auth-pwdialog.[ch] to ka-pwdialog.[ch] - src/Makefile.am | 4 +- - src/ka-pwdialog.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++ - src/ka-pwdialog.h | 65 ++++++++++ - src/krb5-auth-applet.h | 2 +- - src/krb5-auth-dialog.c | 2 +- - src/krb5-auth-pwdialog.c | 310 ----------------------------------------------- - src/krb5-auth-pwdialog.h | 65 ---------- - 7 files changed, 378 insertions(+), 379 deletions(-) + src/Makefile.am | 4 ++-- + src/{krb5-auth-pwdialog.c => ka-pwdialog.c} | 3 +-- + src/{krb5-auth-pwdialog.h => ka-pwdialog.h} | 0 + src/krb5-auth-applet.h | 2 +- + src/krb5-auth-dialog.c | 2 +- + 5 files changed, 5 insertions(+), 6 deletions(-) commit ef9bb4179fba5c7fb77a2908aa618b0a204e518a Author: Guido Günther @@ -3470,13 +3907,11 @@ Date: Wed Apr 28 17:27:54 2010 +0200 Rename krb5-auth-gconf.[ch] to ka-gconf.[ch] - src/Makefile.am | 4 +- - src/ka-gconf.c | 211 +++++++++++++++++++++++++++++++++++++++++++++++++ - src/ka-gconf.h | 29 +++++++ - src/krb5-auth-applet.c | 2 +- - src/krb5-auth-gconf.c | 211 ------------------------------------------------- - src/krb5-auth-gconf.h | 29 ------- - 6 files changed, 243 insertions(+), 243 deletions(-) + src/Makefile.am | 4 ++-- + src/{krb5-auth-gconf.c => ka-gconf.c} | 2 +- + src/{krb5-auth-gconf.h => ka-gconf.h} | 0 + src/krb5-auth-applet.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) commit 2e6c29f113947f03b096e5f15c609712eaa01f4d Author: Guido Günther @@ -3484,10 +3919,9 @@ Date: Wed Apr 28 17:26:13 2010 +0200 Rename krb5-auth-dialog-preferences.[ch] to ka-preferences.[ch] - preferences/Makefile.am | 2 +- - preferences/ka-preferences.c | 843 +++++++++++++++++++++++++++++ - preferences/krb5-auth-dialog-preferences.c | 843 ----------------------------- - 3 files changed, 844 insertions(+), 844 deletions(-) + preferences/Makefile.am | 2 +- + preferences/{krb5-auth-dialog-preferences.c => ka-preferences.c} | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) commit 26f51d8504f5ceaca538fbdb9dc0e94f74176a51 Author: Guido Günther @@ -3495,17 +3929,15 @@ Date: Wed Apr 28 17:24:45 2010 +0200 Rename krb5-auth-gconf-tools.[ch] to ka-gconf-tools.[ch] - preferences/Makefile.am | 4 +- - preferences/krb5-auth-dialog-preferences.c | 2 +- - src/Makefile.am | 4 +- - src/ka-gconf-tools.c | 149 ++++++++++++++++++++++++++++ - src/ka-gconf-tools.h | 48 +++++++++ - src/ka-plugin-loader.c | 2 +- - src/krb5-auth-applet.c | 2 +- - src/krb5-auth-gconf-tools.c | 150 ----------------------------- - src/krb5-auth-gconf-tools.h | 48 --------- - src/krb5-auth-gconf.c | 2 +- - 10 files changed, 205 insertions(+), 206 deletions(-) + preferences/Makefile.am | 4 ++-- + preferences/krb5-auth-dialog-preferences.c | 2 +- + src/Makefile.am | 4 ++-- + src/{krb5-auth-gconf-tools.c => ka-gconf-tools.c} | 3 +-- + src/{krb5-auth-gconf-tools.h => ka-gconf-tools.h} | 0 + src/ka-plugin-loader.c | 2 +- + src/krb5-auth-applet.c | 2 +- + src/krb5-auth-gconf.c | 2 +- + 8 files changed, 9 insertions(+), 10 deletions(-) commit 7a282065467e986c3d0483be9720ca863d93c8e5 Author: Guido Günther @@ -3513,13 +3945,11 @@ Date: Wed Apr 28 17:12:13 2010 +0200 Rename krb5-auth-dbus.[ch] to ka-dbus.[ch] - src/Makefile.am | 4 +- - src/ka-dbus.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/ka-dbus.h | 37 +++++++++++++++ - src/krb5-auth-dbus.c | 120 ------------------------------------------------- - src/krb5-auth-dbus.h | 37 --------------- - src/krb5-auth-dialog.c | 2 +- - 6 files changed, 159 insertions(+), 160 deletions(-) + src/Makefile.am | 4 ++-- + src/{krb5-auth-dbus.c => ka-dbus.c} | 3 +-- + src/{krb5-auth-dbus.h => ka-dbus.h} | 0 + src/krb5-auth-dialog.c | 2 +- + 4 files changed, 4 insertions(+), 5 deletions(-) commit 7b20693fbe233fa6832bfa734f603cc46c3a5a72 Author: Guido Günther @@ -3527,16 +3957,14 @@ Date: Tue Apr 27 22:27:21 2010 +0200 Rename krb5-auth-tools.[ch] to ka-tools.[ch] - preferences/Makefile.am | 4 +-- - preferences/krb5-auth-dialog-preferences.c | 2 +- - src/Makefile.am | 4 +-- - src/ka-tools.c | 57 +++++++++++++++++++++++++++++ - src/ka-tools.h | 32 +++++++++++++++++ - src/krb5-auth-applet.c | 2 +- - src/krb5-auth-dialog.c | 2 +- - src/krb5-auth-tools.c | 58 ------------------------------ - src/krb5-auth-tools.h | 33 ----------------- - 9 files changed, 96 insertions(+), 98 deletions(-) + preferences/Makefile.am | 4 ++-- + preferences/krb5-auth-dialog-preferences.c | 2 +- + src/Makefile.am | 4 ++-- + src/{krb5-auth-tools.c => ka-tools.c} | 3 +-- + src/{krb5-auth-tools.h => ka-tools.h} | 1 - + src/krb5-auth-applet.c | 2 +- + src/krb5-auth-dialog.c | 2 +- + 7 files changed, 8 insertions(+), 10 deletions(-) commit a437955775ad6d795ba206ec178a57255201399f Author: Guido Günther @@ -3544,14 +3972,12 @@ Date: Tue Apr 27 22:23:21 2010 +0200 Rename krb5-auth-tickets.[ch] to ka-tickets.[ch] - src/Makefile.am | 4 +- - src/ka-tickets.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++ - src/ka-tickets.h | 39 ++++++++++++++++ - src/krb5-auth-applet.c | 2 +- - src/krb5-auth-dialog.c | 2 +- - src/krb5-auth-tickets.c | 116 ------------------------------------------------ - src/krb5-auth-tickets.h | 39 ---------------- - 7 files changed, 158 insertions(+), 159 deletions(-) + src/Makefile.am | 4 ++-- + src/{krb5-auth-tickets.c => ka-tickets.c} | 3 +-- + src/{krb5-auth-tickets.h => ka-tickets.h} | 0 + src/krb5-auth-applet.c | 2 +- + src/krb5-auth-dialog.c | 2 +- + 5 files changed, 5 insertions(+), 6 deletions(-) commit a3189fbe66795304751520338bf4b8013f5928bf Author: Jorge González @@ -3761,8 +4187,8 @@ Date: Sat Apr 3 10:02:12 2010 +0200 Updated Slovenian translation - po/sl.po | 1120 +++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 590 insertions(+), 530 deletions(-) + po/sl.po | 1112 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 586 insertions(+), 526 deletions(-) commit 6657dffa9acf9bd9bc360709cc0b5d6a855df05a Author: Guido Günther @@ -3963,8 +4389,8 @@ Date: Mon Oct 19 23:26:42 2009 +0200 Updated German translation - po/de.po | 850 ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 464 insertions(+), 386 deletions(-) + po/de.po | 848 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 463 insertions(+), 385 deletions(-) commit 4b6bf54f2f34e417619e4785af3fe110494f0bec Author: Claude Paroz @@ -3983,8 +4409,8 @@ Date: Fri Oct 9 19:49:06 2009 +0200 so it can still be closed if another window moves over it. - src/krb5-auth-pwdialog.c | 47 +++++++++++++++++++++++++++++++++-------------- - 1 file changed, 33 insertions(+), 14 deletions(-) + src/krb5-auth-pwdialog.c | 49 +++++++++++++++++++++++++++++++++--------------- + 1 file changed, 34 insertions(+), 15 deletions(-) commit 17f830245d522db0b950de993ff3e3fed5b56846 Author: Guido Günther @@ -4069,8 +4495,8 @@ Date: Tue Sep 15 18:30:04 2009 +0200 warn on unsupported cache types - src/krb5-auth-dialog.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) + src/krb5-auth-dialog.c | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) commit ccaf4225dd658c84bef222cc530cc8d21069cd72 Author: Jorge González @@ -4342,8 +4768,8 @@ Date: Sun Jul 5 11:30:47 2009 +0200 Updated Spanish translation - po/es.po | 282 +++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 156 insertions(+), 126 deletions(-) + po/es.po | 278 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 154 insertions(+), 124 deletions(-) commit 1a4aba5b7a71dc913d9ba215b023879766a41b91 Author: Guido Günther @@ -4427,9 +4853,9 @@ Date: Mon Jun 22 11:07:15 2009 +0200 and add filechooser dialog for certificates configure.ac | 10 + - preferences/krb5-auth-dialog-preferences.c | 160 ++++++++++++++- - preferences/krb5-auth-dialog-preferences.xml | 281 ++++++++++++++++----------- - 3 files changed, 337 insertions(+), 114 deletions(-) + preferences/krb5-auth-dialog-preferences.c | 160 +++++++++++++++- + preferences/krb5-auth-dialog-preferences.xml | 271 ++++++++++++++++----------- + 3 files changed, 332 insertions(+), 109 deletions(-) commit 2ad5e90d3191b417efe36a2a033ce6fab3830e76 Author: Guido Günther @@ -4611,8 +5037,8 @@ Date: Sun Jun 14 11:47:27 2009 +0200 Updated sv translation (Daniel Nylander) - po/sv.po | 754 +++++++++++++++++++++++++++++---------------------------------- - 1 file changed, 349 insertions(+), 405 deletions(-) + po/sv.po | 746 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 345 insertions(+), 401 deletions(-) commit 73c1baacc5ce8129020940a1789466e1579078c7 Author: Guido Günther @@ -4707,13 +5133,13 @@ Date: Fri Jun 12 22:46:19 2009 +0200 update po - po/de.po | 143 +++++++++++++++++++++++++++++++++--------------- - po/es.po | 41 +++++++------- - po/krb5-auth-dialog.pot | 131 ++++++++++++++++++++++++++++++-------------- - po/nb.po | 143 +++++++++++++++++++++++++++++++++--------------- - po/pa.po | 43 ++++++++------- - po/sv.po | 131 ++++++++++++++++++++++++++++++-------------- - 6 files changed, 422 insertions(+), 210 deletions(-) + po/de.po | 137 +++++++++++++++++++++++++++++++++--------------- + po/es.po | 41 ++++++++------- + po/krb5-auth-dialog.pot | 129 +++++++++++++++++++++++++++++++-------------- + po/nb.po | 135 +++++++++++++++++++++++++++++++++-------------- + po/pa.po | 43 +++++++-------- + po/sv.po | 129 +++++++++++++++++++++++++++++++-------------- + 6 files changed, 413 insertions(+), 201 deletions(-) commit eede48773890ba17d15cfa93eee14cdcb276d1a0 Author: Guido Günther @@ -4769,26 +5195,23 @@ Date: Wed Jun 3 18:19:51 2009 +0200 and move icons from pkgdatadir to datadir - ChangeLog | 11 + - configure.ac | 3 + - icons/22x22/Makefile.am | 10 + - icons/22x22/krb-expiring-ticket.png | Bin 0 -> 1341 bytes - icons/22x22/krb-no-valid-ticket.png | Bin 0 -> 1234 bytes - icons/22x22/krb-valid-ticket.png | Bin 0 -> 1126 bytes - icons/48x48/Makefile.am | 10 + - icons/48x48/krb-expiring-ticket.png | Bin 0 -> 3571 bytes - icons/48x48/krb-no-valid-ticket.png | Bin 0 -> 3724 bytes - icons/48x48/krb-valid-ticket.png | Bin 0 -> 3383 bytes - icons/Makefile.am | 21 +- - icons/krb-expiring-ticket.png | Bin 1341 -> 0 bytes - icons/krb-no-valid-ticket.png | Bin 1234 -> 0 bytes - icons/krb-valid-ticket.png | Bin 1126 -> 0 bytes - icons/scalable/Makefile.am | 11 + - icons/scalable/krb-expiring-ticket.svg | 936 ++++++++++++++++++++++ - icons/scalable/krb-no-valid-ticket.svg | 1339 ++++++++++++++++++++++++++++++++ - icons/scalable/krb-valid-ticket.svg | 557 +++++++++++++ - src/Makefile.am | 1 + - 19 files changed, 2890 insertions(+), 9 deletions(-) + ChangeLog | 11 + + configure.ac | 3 + + icons/22x22/Makefile.am | 10 + + icons/{ => 22x22}/krb-expiring-ticket.png | Bin + icons/{ => 22x22}/krb-no-valid-ticket.png | Bin + icons/{ => 22x22}/krb-valid-ticket.png | Bin + icons/48x48/Makefile.am | 10 + + icons/48x48/krb-expiring-ticket.png | Bin 0 -> 3571 bytes + icons/48x48/krb-no-valid-ticket.png | Bin 0 -> 3724 bytes + icons/48x48/krb-valid-ticket.png | Bin 0 -> 3383 bytes + icons/Makefile.am | 21 +- + icons/scalable/Makefile.am | 11 + + icons/scalable/krb-expiring-ticket.svg | 936 ++++++++++++++++++++ + icons/scalable/krb-no-valid-ticket.svg | 1339 +++++++++++++++++++++++++++++ + icons/scalable/krb-valid-ticket.svg | 557 ++++++++++++ + src/Makefile.am | 1 + + 16 files changed, 2890 insertions(+), 9 deletions(-) commit 137b6ab92e2e5c762e6f36044542abb9dd75406b Author: A S Alam @@ -4796,8 +5219,8 @@ Date: Mon Jun 8 07:01:48 2009 +0530 updating Translation for Gurmukhi - po/pa.po | 692 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 351 insertions(+), 341 deletions(-) + po/pa.po | 684 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 347 insertions(+), 337 deletions(-) commit f359ac03f203f6031a3ad8f620c98bc1047fa43a Author: Jorge Gonzalez @@ -4989,11 +5412,11 @@ Date: Fri May 15 18:33:07 2009 +0200 update translatable strings ChangeLog | 7 + - po/de.po | 2888 ++++++++++----------------------------------- - po/krb5-auth-dialog.pot | 2869 ++++++++++----------------------------------- - po/nb.po | 2983 +++++++++++++---------------------------------- - po/sv.po | 2929 +++++++++++----------------------------------- - 5 files changed, 2740 insertions(+), 8936 deletions(-) + po/de.po | 3344 ++++++++++++----------------------------------- + po/krb5-auth-dialog.pot | 3243 ++++++++++++--------------------------------- + po/nb.po | 3219 +++++++++++++-------------------------------- + po/sv.po | 3283 ++++++++++++---------------------------------- + 5 files changed, 3450 insertions(+), 9646 deletions(-) commit 0ed20a2f652ab45c57c9369b8dad08ae2edb3605 Author: Guido Günther @@ -5138,23 +5561,21 @@ Date: Tue May 5 00:16:47 2009 +0200 Switch from Libglade to GtkBuilder - ChangeLog | 14 + - configure.ac | 6 +- - etpo/Makefile.am | 2 - - po/POTFILES.in | 4 +- - preferences/Makefile.am | 3 +- - preferences/krb5-auth-dialog-preferences.c | 27 +- - preferences/krb5-auth-dialog-preferences.glade | 620 ----------------------- - preferences/krb5-auth-dialog-preferences.xml | 657 +++++++++++++++++++++++++ - src/Makefile.am | 3 +- - src/krb5-auth-applet.c | 2 +- - src/krb5-auth-applet.h | 3 +- - src/krb5-auth-dialog.c | 32 +- - src/krb5-auth-dialog.glade | 138 ------ - src/krb5-auth-dialog.xml | 155 ++++++ - src/krb5-auth-pwdialog.c | 16 +- - src/krb5-auth-pwdialog.h | 3 +- - 16 files changed, 863 insertions(+), 822 deletions(-) + ChangeLog | 14 + + configure.ac | 6 +- + etpo/Makefile.am | 2 - + po/POTFILES.in | 4 +- + preferences/Makefile.am | 3 +- + preferences/krb5-auth-dialog-preferences.c | 27 +- + ...nces.glade => krb5-auth-dialog-preferences.xml} | 347 ++++++++++++--------- + src/Makefile.am | 3 +- + src/krb5-auth-applet.c | 2 +- + src/krb5-auth-applet.h | 3 +- + src/krb5-auth-dialog.c | 32 +- + ...krb5-auth-dialog.glade => krb5-auth-dialog.xml} | 109 ++++--- + src/krb5-auth-pwdialog.c | 16 +- + src/krb5-auth-pwdialog.h | 3 +- + 14 files changed, 306 insertions(+), 265 deletions(-) commit caf8e1b7539269b91ec85500381dbbdaa6a6093b Author: Guido Günther @@ -5286,8 +5707,8 @@ Date: Thu Apr 23 21:06:19 2009 +0200 based on a patch for 0.8 by Matthias Clasen ChangeLog | 9 +++++++++ - src/krb5-auth-applet.c | 37 +++++++++++++++++++++++++++++-------- - 2 files changed, 38 insertions(+), 8 deletions(-) + src/krb5-auth-applet.c | 35 ++++++++++++++++++++++++++++------- + 2 files changed, 37 insertions(+), 7 deletions(-) commit 3c27e64b15a084f7cdc3923b7f4085e5a6820222 Author: Guido Günther @@ -5819,8 +6240,8 @@ Date: Sat Jan 10 13:25:51 2009 +0000 svn path=/trunk/; revision=115 po/ChangeLog | 4 + - po/krb5-auth-dialog.pot | 1413 ++++++++++++++++++++++++++--------------------- - 2 files changed, 799 insertions(+), 618 deletions(-) + po/krb5-auth-dialog.pot | 1405 ++++++++++++++++++++++++++--------------------- + 2 files changed, 795 insertions(+), 614 deletions(-) commit fc1a25c2491681dfd61448bd9e0ac23cef1a929b Author: Guido Günther @@ -5930,9 +6351,9 @@ Date: Sat Jan 10 13:25:36 2009 +0000 README | 4 + configure.ac | 21 ++++ src/krb5-auth-applet.h | 3 +- - src/krb5-auth-dialog.c | 298 +++++++++++++++++++++++++++++++------------------ + src/krb5-auth-dialog.c | 300 +++++++++++++++++++++++++++++++------------------ src/krb5-auth-gconf.c | 16 +++ - 6 files changed, 248 insertions(+), 109 deletions(-) + 6 files changed, 249 insertions(+), 110 deletions(-) commit d485821fc3151f3082a43679894bd768cdd18ab4 Author: Guido Günther @@ -6116,11 +6537,11 @@ Date: Mon Jun 9 20:03:38 2008 +0000 2008-06-09 Colin Walters - Bug 534867: should use g_timeout_add_seconds + Bug 534867: should use g_timeout_add_seconds - * src/krb5-auth-dialog.c: Save power with - g_timeout_add_seconds. - Patch from from Guido Günther. + * src/krb5-auth-dialog.c: Save power with + g_timeout_add_seconds. + Patch from from Guido Günther. @@ -6138,11 +6559,11 @@ Date: Mon Jun 9 19:58:45 2008 +0000 2008-06-09 Colin Walters - Bug 534736: make i18n work + Bug 534736: make i18n work - * src/krb5-auth-dialog.c: Set up i18n correctly. - * src/Makefile.am: Pass in LOCALEDIR. - Patch from from Guido Günther. + * src/krb5-auth-dialog.c: Set up i18n correctly. + * src/Makefile.am: Pass in LOCALEDIR. + Patch from from Guido Günther. svn path=/trunk/; revision=77 @@ -6160,11 +6581,11 @@ Date: Mon Jun 9 19:49:21 2008 +0000 2008-06-09 Colin Walters - Bug 534620: password field focus + Bug 534620: password field focus - * src/krb5-auth-dialog.c: Be sure we focus the - password field every time. - Patch from from Guido Günther. + * src/krb5-auth-dialog.c: Be sure we focus the + password field every time. + Patch from from Guido Günther. svn path=/trunk/; revision=76 @@ -6181,10 +6602,10 @@ Date: Mon Jun 9 19:08:47 2008 +0000 2008-06-09 Colin Walters - Bug 534515: cleanups + Bug 534515: cleanups - * configure.in: Look for dbus-glib and not libgnome. - Patch from from Guido Günther. + * configure.in: Look for dbus-glib and not libgnome. + Patch from from Guido Günther. svn path=/trunk/; revision=75 @@ -6201,10 +6622,10 @@ Date: Mon Jun 9 19:07:53 2008 +0000 2008-06-09 Colin Walters - Bug 534515: cleanups + Bug 534515: cleanups - * src/krb5-auth-dialog.c: Cleaner use of - gboolean. Patch from from Guido Günther. + * src/krb5-auth-dialog.c: Cleaner use of + gboolean. Patch from from Guido Günther. svn path=/trunk/; revision=74 @@ -6221,10 +6642,10 @@ Date: Mon Jun 9 19:06:52 2008 +0000 2008-06-09 Colin Walters - Bug 534515: cleanups + Bug 534515: cleanups - * src/krb5-auth-dialog.c: Use GOption instead of - libgnome. Patch from Guido Günther. + * src/krb5-auth-dialog.c: Use GOption instead of + libgnome. Patch from Guido Günther. svn path=/trunk/; revision=73 @@ -6239,11 +6660,11 @@ Date: Mon Jun 9 18:00:13 2008 +0000 +2008-06-09 Colin Walters + - + Bug 529220: set dialog icon + + Bug 529220: set dialog icon + - + * src/krb5-auth-dialog.c: Set an icon so we - + look nicer in the window list. Patch from - + Guido Günther. + + * src/krb5-auth-dialog.c: Set an icon so we + + look nicer in the window list. Patch from + + Guido Günther. + svn path=/trunk/; revision=72 @@ -6260,10 +6681,10 @@ Date: Sat Mar 22 05:07:06 2008 +0000 2008-03-22 Colin Walters - + * src/krb5-auth-dialog.c: Grab a name on the - + session bus to be doubly sure we don't have - + multiple copies. Also don't connect to the - + session manager, since it's not needed. + + * src/krb5-auth-dialog.c: Grab a name on the + + session bus to be doubly sure we don't have + + multiple copies. Also don't connect to the + + session manager, since it's not needed. + svn path=/trunk/; revision=71 @@ -6278,9 +6699,9 @@ Date: Sat Mar 22 04:26:58 2008 +0000 +2008-03-22 Colin Walters + - + * MAINTAINERS: New file. - + * src/krb5-auth-dialog.c: Connect to session bus - + to be sure we exit when the session dies. + + * MAINTAINERS: New file. + + * src/krb5-auth-dialog.c: Connect to session bus + + to be sure we exit when the session dies. + svn path=/trunk/; revision=70 @@ -6308,8 +6729,8 @@ Date: Fri Nov 2 12:29:30 2007 +0000 2007-11-02 Kjartan Maraas,,23491770 - * POTFILES.in: Add .desktop.in file. - * nb.po: Updated Norwegian bokmål translation. + * POTFILES.in: Add .desktop.in file. + * nb.po: Updated Norwegian bokmål translation. svn path=/trunk/; revision=68 @@ -6326,9 +6747,9 @@ Date: Sun Oct 29 22:46:33 2006 +0000 2006-10-29 Christopher Aillon - * src/krb5-auth-dialog.c: - Refactor code slightly, removing an #ifdef in favor - of a wrapper. Consolidate coding style. + * src/krb5-auth-dialog.c: + Refactor code slightly, removing an #ifdef in favor + of a wrapper. Consolidate coding style. ChangeLog | 2 + src/krb5-auth-dialog.c | 103 +++++++++++++++++++++++++------------------------ @@ -6342,12 +6763,12 @@ Date: Sun Oct 29 17:42:34 2006 +0000 2006-10-29 Christopher Aillon - * src/krb5-auth-dialog.c: Clean up the #ifdefs to - make things slightly more readable. + * src/krb5-auth-dialog.c: Clean up the #ifdefs to + make things slightly more readable. - ChangeLog | 5 +++ - src/krb5-auth-dialog.c | 93 ++++++++++++++++++-------------------------------- - 2 files changed, 39 insertions(+), 59 deletions(-) + ChangeLog | 5 ++++ + src/krb5-auth-dialog.c | 81 +++++++++++++++++--------------------------------- + 2 files changed, 33 insertions(+), 53 deletions(-) commit b684283623c69ae8c1a69536628b79c531ff6bdd Author: Christopher Aillon @@ -6357,7 +6778,7 @@ Date: Mon Jul 24 17:59:24 2006 +0000 2006-07-24 Christopher Aillon - * configure.ac: Release 0.7 + * configure.ac: Release 0.7 ChangeLog | 4 ++++ configure.ac | 2 +- @@ -6371,12 +6792,12 @@ Date: Mon Jul 24 17:48:24 2006 +0000 2006-07-24 Christopher Aillon - * src/krb5-auth-dialog.c: Don't immediately retry - to reach the KDC if it is unavailable. That will - just loop forever (until the KDC becomes available). - Bail out; we'll check (once!) to see whether it's - there the next time our g_timeout callback gets - invoked. + * src/krb5-auth-dialog.c: Don't immediately retry + to reach the KDC if it is unavailable. That will + just loop forever (until the KDC becomes available). + Bail out; we'll check (once!) to see whether it's + there the next time our g_timeout callback gets + invoked. ChangeLog | 9 +++++++++ src/krb5-auth-dialog.c | 7 ++++++- @@ -6390,8 +6811,8 @@ Date: Tue Apr 18 06:08:07 2006 +0000 2006-04-18 Kjartan Maraas - * configure.ac: Remove obsolete entry for no_NO - * po/no.po: And the translation + * configure.ac: Remove obsolete entry for no_NO + * po/no.po: And the translation ChangeLog | 5 + configure.ac | 2 +- @@ -6406,11 +6827,11 @@ Date: Sat Mar 18 00:21:08 2006 +0000 2006-03-17 Christopher Aillon - * src/krb5-auth-dialog.c: Check to see whether credentials - are renewable; if so, renew them automatically. Implement this - for the MIT implementation only. (Fixes #331210) + * src/krb5-auth-dialog.c: Check to see whether credentials + are renewable; if so, renew them automatically. Implement this + for the MIT implementation only. (Fixes #331210) - * configure.ac: Add test to see whether we have krb5_get_renewed_creds + * configure.ac: Add test to see whether we have krb5_get_renewed_creds ChangeLog | 8 +++ configure.ac | 4 ++ @@ -6424,9 +6845,9 @@ Date: Thu Feb 2 02:51:12 2006 +0000 keep track of whether or not the user explicitly canceled our last request * src/krb5-auth-dialog.c: keep track of whether or not the user explicitly - canceled our last request for information. If she did, then don't ask - again while the expiration time remains unchanged. Change recursion - inside of renew_credentials() into a loop in its calling function. + canceled our last request for information. If she did, then don't ask + again while the expiration time remains unchanged. Change recursion + inside of renew_credentials() into a loop in its calling function. ChangeLog | 7 +++++++ src/krb5-auth-dialog.c | 26 +++++++++++++++++++++++--- @@ -6439,10 +6860,10 @@ Date: Wed Feb 1 22:11:34 2006 +0000 rename to avoid polluting the krb5 namespace. don't use time() to figure * src/krb5-auth-dialog.c(krb5_gtk_prompter): rename to avoid polluting - the krb5 namespace. + the krb5 namespace. * src/krb5-auth-dialog.c: don't use time() to figure out what time it - is -- we always compare against a krb5_timestamp, so use the libkrb5 - routines which return the current time instead. + is -- we always compare against a krb5_timestamp, so use the libkrb5 + routines which return the current time instead. ChangeLog | 7 +++++++ src/krb5-auth-dialog.c | 36 +++++++++++++++++++++++++----------- @@ -6467,7 +6888,7 @@ Date: Wed Feb 1 18:05:14 2006 +0000 fix a warning where we were passing an int where a pointer was expected * src/krb5-auth-dialog.c(renew_credentials): fix a warning where we - were passing an int where a pointer was expected + were passing an int where a pointer was expected src/krb5-auth-dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -6480,7 +6901,7 @@ Date: Tue Jan 31 06:49:30 2006 +0000 2006-01-31 Christopher Aillon - * configure.ac: Release 0.6 + * configure.ac: Release 0.6 ChangeLog | 4 ++++ configure.ac | 2 +- @@ -6503,14 +6924,14 @@ Date: Tue Jan 31 05:41:57 2006 +0000 2006-01-31 Christopher Aillon - * src/krb5-auth-dialog.desktop.in: - Add desktop file for autostart + * src/krb5-auth-dialog.desktop.in: + Add desktop file for autostart - * krb5-auth-dialog.spec.in: - * src/Makefile.am: - Install desktop file to the correct location + * krb5-auth-dialog.spec.in: + * src/Makefile.am: + Install desktop file to the correct location - * src/.cvsignore: Add generated file + * src/.cvsignore: Add generated file ChangeLog | 11 +++++++++++ krb5-auth-dialog.spec.in | 1 + @@ -6536,8 +6957,8 @@ Date: Tue Jan 31 05:19:15 2006 +0000 2006-01-31 Christopher Aillon - * src/krb5-auth-dialog.glade: Don't explicitly - set the invisible_char to '*', get it from GTK+ + * src/krb5-auth-dialog.glade: Don't explicitly + set the invisible_char to '*', get it from GTK+ ChangeLog | 5 +++++ src/krb5-auth-dialog.glade | 1 - @@ -6551,7 +6972,7 @@ Date: Tue Nov 8 19:45:41 2005 +0000 2005-11-08 Christopher Aillon - * configure.ac: Release 0.5 + * configure.ac: Release 0.5 ChangeLog | 4 ++++ configure.ac | 2 +- @@ -6583,8 +7004,8 @@ Date: Thu Nov 3 23:05:10 2005 +0000 2005-11-03 Christopher Aillon - * src/krb5-auth-dialog.c: Consolidate how we figure out the - expiry text + * src/krb5-auth-dialog.c: Consolidate how we figure out the + expiry text ChangeLog | 5 +++++ src/krb5-auth-dialog.c | 37 +++++++++++++++++++++++-------------- @@ -6598,7 +7019,7 @@ Date: Thu Nov 3 21:13:33 2005 +0000 2005-11-03 Christopher Aillon - * src/krb5-auth-dialog.c: Use ngettext () where appropriate + * src/krb5-auth-dialog.c: Use ngettext () where appropriate ChangeLog | 4 ++++ src/krb5-auth-dialog.c | 14 +++++++++++--- @@ -6625,10 +7046,10 @@ Date: Wed Nov 2 23:49:40 2005 +0000 make the minimum acceptable lifetime for new credentials the minimum that * configure.ac,src/krb5-auth-dialog.c: make the minimum acceptable lifetime - for new credentials the minimum that would force us to take action, - not the amount of time we wait in between checks. Let the check - interval be defined in seconds and the minimum lifetime be specified - in minutes. + for new credentials the minimum that would force us to take action, + not the amount of time we wait in between checks. Let the check + interval be defined in seconds and the minimum lifetime be specified + in minutes. ChangeLog | 8 ++++++++ configure.ac | 14 ++++++++++++++ @@ -6642,7 +7063,7 @@ Date: Wed Nov 2 23:26:57 2005 +0000 just test for the definitions of the flags directly. * configure.ac,src/krb5-auth-dialog.c: just test for the definitions of the - flags directly. + flags directly. ChangeLog | 5 +++++ configure.ac | 2 -- @@ -6656,7 +7077,7 @@ Date: Wed Nov 2 23:11:08 2005 +0000 silence a couple of compiler warnings about implicitly-declared functions. * etpo/lexer.l,etpo/grammar.y: silence a couple of compiler warnings about - implicitly-declared functions. + implicitly-declared functions. ChangeLog | 7 ++++++- etpo/grammar.y | 2 ++ @@ -6671,7 +7092,7 @@ Date: Wed Nov 2 23:10:01 2005 +0000 * configure.ac: test for differences between the Heimdal and MIT Kerberos APIs * src/krb5-auth-dialog.c: abstract out differences in how credential flags - and realm names are stored. + and realm names are stored. ChangeLog | 7 ++++ configure.ac | 45 ++++++++++++++++++++--- @@ -6695,7 +7116,7 @@ Date: Tue Nov 1 17:47:46 2005 +0000 2005-11-01 Christopher Aillon - * configure.ac: Release 0.4 + * configure.ac: Release 0.4 ChangeLog | 4 ++++ configure.ac | 2 +- @@ -6709,25 +7130,25 @@ Date: Tue Nov 1 13:35:01 2005 +0000 2005-11-01 Christopher Aillon - * Makefile.am: - * krb5-auth-dialog.spec.in: - * src/krb5-auth-dialog.c - Patch from Nalin Dahyabhai - - Fix the .spec file so that it doesn't choke due to - translations. - - Include the .spec file in the dist tarball so that - 'rpmbuild -ts' will work. - - Correct a compiler warning. - - Set forwardable/proxiable/lifetime from the current ccache, - if there is one. - - Add a "--always" flag to let us pinch-hit for 'kinit'. - - Add a "--auto" flag to override it. - - Interpret a preauthentication failure as a bad password. - - If we already have a ccache, use its default principal as our - default, in case it differs from the local user name. If the - default principal changes out from under us, pick it up, too. - - Don't give a bogus lifetime if the ccache is deleted between - checks. + * Makefile.am: + * krb5-auth-dialog.spec.in: + * src/krb5-auth-dialog.c + Patch from Nalin Dahyabhai + - Fix the .spec file so that it doesn't choke due to + translations. + - Include the .spec file in the dist tarball so that + 'rpmbuild -ts' will work. + - Correct a compiler warning. + - Set forwardable/proxiable/lifetime from the current ccache, + if there is one. + - Add a "--always" flag to let us pinch-hit for 'kinit'. + - Add a "--auto" flag to override it. + - Interpret a preauthentication failure as a bad password. + - If we already have a ccache, use its default principal as our + default, in case it differs from the local user name. If the + default principal changes out from under us, pick it up, too. + - Don't give a bogus lifetime if the ccache is deleted between + checks. ChangeLog | 22 ++++++ Makefile.am | 3 +- @@ -6743,7 +7164,7 @@ Date: Mon Oct 31 22:01:17 2005 +0000 2005-10-31 Christopher Aillon - * configure.ac: Release 0.3 + * configure.ac: Release 0.3 ChangeLog | 4 ++++ configure.ac | 2 +- @@ -6757,10 +7178,10 @@ Date: Mon Oct 31 21:55:46 2005 +0000 2005-10-31 Christopher Aillon - * Makefile.am: - * src/Makefile.am: - * src/dummy-strings.c: - Make `make distcheck` happy + * Makefile.am: + * src/Makefile.am: + * src/dummy-strings.c: + Make `make distcheck` happy ChangeLog | 7 +++++++ Makefile.am | 7 +++++++ @@ -6786,8 +7207,8 @@ Date: Mon Oct 31 19:45:12 2005 +0000 2005-10-31 Christopher Aillon - * src/krb5-auth-dialog.c: Memleak fixes - Also, respect the hidden field of krb5_prompt + * src/krb5-auth-dialog.c: Memleak fixes + Also, respect the hidden field of krb5_prompt ChangeLog | 5 +++++ src/krb5-auth-dialog.c | 39 +++++++++++++++++++-------------------- @@ -6801,9 +7222,9 @@ Date: Mon Oct 31 18:15:52 2005 +0000 2005-10-31 Christopher Aillon - * src/krb5-auth-dialog.c: Fix test to determine whether we - are using krb5 using new get_tgt_from_ccache () function - from Nalin Dahyabhai + * src/krb5-auth-dialog.c: Fix test to determine whether we + are using krb5 using new get_tgt_from_ccache () function + from Nalin Dahyabhai ChangeLog | 6 +++++ src/krb5-auth-dialog.c | 72 +++++++++++++++++++++++++++++++++++++------------- @@ -6817,8 +7238,8 @@ Date: Mon Oct 31 07:22:41 2005 +0000 2005-10-31 Christopher Aillon - * src/krb5-auth-dialog.c: Set the application name. - Also, say less 'kerberos' in user visible text. + * src/krb5-auth-dialog.c: Set the application name. + Also, say less 'kerberos' in user visible text. ChangeLog | 5 +++++ src/krb5-auth-dialog.c | 4 +++- @@ -6832,11 +7253,11 @@ Date: Mon Oct 31 07:05:30 2005 +0000 2005-10-31 Christopher Aillon - * src/krb5-auth-dialog.c: Update the credentials expiry time + * src/krb5-auth-dialog.c: Update the credentials expiry time - ChangeLog | 4 +++ - src/krb5-auth-dialog.c | 66 +++++++++++++++++++++++++++++++++++++++----------- - 2 files changed, 56 insertions(+), 14 deletions(-) + ChangeLog | 4 ++++ + src/krb5-auth-dialog.c | 62 ++++++++++++++++++++++++++++++++++++++++---------- + 2 files changed, 54 insertions(+), 12 deletions(-) commit 023f791dc1a2cf57879dc6a910f41de802033bd8 Author: Christopher Aillon @@ -6846,8 +7267,8 @@ Date: Mon Oct 31 06:01:46 2005 +0000 2005-10-31 Christopher Aillon - * src/krb5-auth-dialog.c: No need to pass around our GladeXML - since its a static global + * src/krb5-auth-dialog.c: No need to pass around our GladeXML + since its a static global ChangeLog | 5 +++++ src/krb5-auth-dialog.c | 7 +++---- @@ -6861,8 +7282,8 @@ Date: Mon Oct 31 05:55:04 2005 +0000 2005-10-31 Christopher Aillon - * src/krb5-auth-dialog.c: The dialog shouldn't have two labels - reading 'Password:' so make the primary one have better text. + * src/krb5-auth-dialog.c: The dialog shouldn't have two labels + reading 'Password:' so make the primary one have better text. ChangeLog | 5 +++++ src/krb5-auth-dialog.c | 35 ++++++++++++++++++++++++----------- @@ -6876,10 +7297,10 @@ Date: Sat Oct 29 18:42:16 2005 +0000 2005-10-29 Christopher Aillon - * configure.ac: - * src/Makefile.am: - * src/krb5-auth-dialog.c: Use libnm-glib for NetworkManager support - instead of the NetworkManager D-BUS API. + * configure.ac: + * src/Makefile.am: + * src/krb5-auth-dialog.c: Use libnm-glib for NetworkManager support + instead of the NetworkManager D-BUS API. ChangeLog | 7 +++ configure.ac | 35 ++++++------ @@ -6895,7 +7316,7 @@ Date: Sat Oct 29 07:17:38 2005 +0000 2005-10-29 Christopher Aillon - * Makefile.in.in: this is generated, no need to live in repository + * Makefile.in.in: this is generated, no need to live in repository po/ChangeLog | 4 + po/Makefile.in.in | 254 ------------------------------------------------------ @@ -6909,11 +7330,11 @@ Date: Sat Oct 29 06:25:42 2005 +0000 2005-10-29 Christopher Aillon - * src/krb5-auth-dialog.c: Reformat using tabs instead of spaces + * src/krb5-auth-dialog.c: Reformat using tabs instead of spaces ChangeLog | 6 +- - src/krb5-auth-dialog.c | 616 +++++++++++++++++++++++++------------------------ - 2 files changed, 314 insertions(+), 308 deletions(-) + src/krb5-auth-dialog.c | 652 +++++++++++++++++++++++++------------------------ + 2 files changed, 332 insertions(+), 326 deletions(-) commit 6e04a5ef624e17d052a939957d49c21c4682a2c3 Author: Christopher Aillon @@ -6950,16 +7371,16 @@ Date: Thu Sep 2 05:00:59 2004 +0000 2004-09-02 Colin Walters - * configure.in: Check for NetworkManager. + * configure.in: Check for NetworkManager. - * Makefile.am: Add NETWORKMANAGER_LIBS. + * Makefile.am: Add NETWORKMANAGER_LIBS. - * src/krb5-auth-dialog.c (am_online): New function, - uses NetworkManager over D-BUS to determine - whether or not we're online. + * src/krb5-auth-dialog.c (am_online): New function, + uses NetworkManager over D-BUS to determine + whether or not we're online. - * src/krb5-auth-dialog.c (credentials_expiring): Don't - try to renew credentials if we're not online. + * src/krb5-auth-dialog.c (credentials_expiring): Don't + try to renew credentials if we're not online. ChangeLog | 14 ++++++- configure.ac | 20 ++++++++- @@ -6975,9 +7396,9 @@ Date: Sun Aug 29 19:55:25 2004 +0000 2004-08-28 Diego Gonzalez - * configure.ac: add --with-heimdal - * krb5-auth-dialog: modify to support heimdal if enabled - * krb5-auth-dialog.glade: center the dialog + * configure.ac: add --with-heimdal + * krb5-auth-dialog: modify to support heimdal if enabled + * krb5-auth-dialog.glade: center the dialog ChangeLog | 8 +++++++- configure.ac | 5 +++++ @@ -6993,7 +7414,7 @@ Date: Thu Aug 19 15:20:15 2004 +0000 2004-08-19 Kjartan Maraas - * configure.ac: Added «nb» and «no» to ALL_LINGUAS. + * configure.ac: Added «nb» and «no» to ALL_LINGUAS. ChangeLog | 4 ++++ configure.ac | 2 +- @@ -7007,8 +7428,8 @@ Date: Thu Aug 19 15:19:47 2004 +0000 2004-08-19 Kjartan Maraas - * nb.po: Add this - * no.po: and this + * nb.po: Add this + * no.po: and this po/ChangeLog | 5 + po/nb.po | 3116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/INSTALL b/INSTALL index 2099840..8865734 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,97 +12,96 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell command `./configure && make && make install' + Briefly, the shell command './configure && make && make install' should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for +more-detailed instructions are generic; see the 'README' file for instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented +'INSTALL' file but do not implement all of the features documented below. The lack of an optional feature in a given package is not necessarily a bug. More recommendations for GNU packages can be found in *note Makefile Conventions: (standards)Makefile Conventions. - The `configure' shell script attempts to guess correct values for + The 'configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you +some point 'config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. - Running `configure' might take a while. While running, it prints + Running 'configure' might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type 'make' to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type 'make check' to run any self-tests that come with the package, generally using the just-built uninstalled binaries. - 4. Type `make install' to install the programs and any data files and + 4. Type 'make install' to install the programs and any data files and documentation. When installing into a prefix owned by root, it is recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root + user, and only the 'make install' phase executed with root privileges. - 5. Optionally, type `make installcheck' to repeat any self-tests, but + 5. Optionally, type 'make installcheck' to repeat any self-tests, but this time using the binaries in their final installed location. This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required + regular user, particularly if the prior 'make install' required root privileges, verifies that the installation completed correctly. 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed + 7. Often, you can also type 'make uninstall' to remove the installed files again. In practice, not all packages have tested that uninstallation works correctly, even though it is required by the GNU Coding Standards. - 8. Some packages, particularly those that use Automake, provide `make + 8. Some packages, particularly those that use Automake, provide 'make distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. + targets like 'make install' and 'make uninstall' work correctly. This target is generally not run by end users. Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' +the 'configure' script does not know about. Run './configure --help' for details on some of the pertinent environment variables. - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: ./configure CC=c99 CFLAGS=-g LIBS=-lposix @@ -113,21 +112,21 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you can use GNU 'make'. 'cd' to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. - With a non-GNU `make', it is safer to compile the package for one + With a non-GNU 'make', it is safer to compile the package for one architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before +installed the package for one architecture, use 'make distclean' before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like this: ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ @@ -136,105 +135,104 @@ this: This is not guaranteed to produce working output in all cases, you may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. +using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses PREFIX as the prefix for installing programs and libraries. Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory specifications that were not explicitly provided. The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or +correct locations to 'configure'; however, many packages provide one or both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without +'make install' command line to change installation locations without having to reconfigure or recompile. The first method involves providing an override variable for each -affected directory. For example, `make install +affected directory. For example, 'make install prefix=/alternate/directory' will choose an alternate location for all directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. + + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and does not work on platforms that have drive letters. On the other hand, it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. Optional Features ================= If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. + + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, 'configure' can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure +execution of 'make' will be. For these packages, running './configure --enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure +overridden with 'make V=1'; while running './configure --disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. +overridden with 'make V=0'. Particular systems ================== - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in order to use an ANSI C compiler: ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. + HP-UX 'make' updates targets which have the same time stamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try +parse its '' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try ./configure CC="cc" @@ -242,26 +240,26 @@ and if that doesn't work, try ./configure CC="cc -nodtk" - On Solaris, don't put `/usr/ucb' early in your `PATH'. This + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features `configure' cannot figure out + There may be some features 'configure' cannot figure out automatically, but needs to determine by the type of machine the package will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints +_same_ architectures, 'configure' can figure that out, but if it prints a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: CPU-COMPANY-SYSTEM @@ -270,101 +268,101 @@ where SYSTEM can have one of these forms: OS KERNEL-OS - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the option '--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a platform different from the build platform, you should specify the "host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. +eventually be run) with '--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. Defining Variables ================== Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run +environment passed to 'configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: +them in the 'configure' command line, using 'VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -causes the specified `gcc' to be used as the C compiler (unless it is +causes the specified 'gcc' to be used as the C compiler (unless it is overridden in the site shell script). -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash -`configure' Invocation +'configure' Invocation ====================== - `configure' recognizes the following options to control how it + 'configure' recognizes the following options to control how it operates. -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. -`--help=short' -`--help=recursive' +'--help=short' +'--help=recursive' Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' script, and exit. -`--cache-file=FILE' +'--cache-file=FILE' Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to + traditionally 'config.cache'. FILE defaults to '/dev/null' to disable caching. -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. -`--quiet' -`--silent' -`-q' +'--quiet' +'--silent' +'-q' Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to '/dev/null' (any error messages will still be shown). -`--srcdir=DIR' +'--srcdir=DIR' Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + 'configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. -`--no-create' -`-n' +'--no-create' +'-n' Run the configure checks, but stop before creating any output files. -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. diff --git a/Makefile.in b/Makefile.in index 44d2295..ca67245 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -161,8 +161,8 @@ CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/krb5-auth-dialog.spec.in AUTHORS COPYING ChangeLog \ - INSTALL NEWS README compile config.guess config.sub depcomp \ - install-sh ltmain.sh missing ylwrap + INSTALL NEWS README compile config.guess config.sub install-sh \ + ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -264,6 +264,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ @@ -643,7 +644,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -668,7 +669,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -686,7 +687,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -696,7 +697,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/aclocal.m4 b/aclocal.m4 index 186b963..67e3a75 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -119,6 +119,51 @@ fi AC_SUBST($1)dnl ]) +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. +dnl +dnl Copied from intlmacosx.m4 in gettext, GPL. +dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +glib_DEFUN([glib_gt_INTL_MACOSX], +[ + dnl Check for API introduced in Mac OS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in Mac OS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyCurrent();]])], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) + # GLIB_WITH_NLS #----------------- glib_DEFUN([GLIB_WITH_NLS], @@ -132,6 +177,8 @@ glib_DEFUN([GLIB_WITH_NLS], XGETTEXT=: INTLLIBS= + glib_gt_INTL_MACOSX + AC_CHECK_HEADER(libintl.h, [gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -215,7 +262,7 @@ glib_DEFUN([GLIB_WITH_NLS], fi if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" + INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" fi if test "$gt_cv_have_gettext" = "yes"; then @@ -675,31 +722,6 @@ fi # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - IT_PO_SUBDIR([po]) ]) @@ -1480,7 +1502,6 @@ _LT_CONFIG_SAVE_COMMANDS([ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -10113,7 +10134,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10128,7 +10149,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -10144,14 +10165,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10203,7 +10224,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10234,7 +10255,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10425,7 +10446,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10501,7 +10522,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10698,7 +10719,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10719,7 +10740,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10741,7 +10762,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10776,7 +10797,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10826,7 +10847,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10865,7 +10886,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10894,7 +10915,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10941,7 +10962,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10960,7 +10981,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11041,7 +11062,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11101,7 +11122,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11129,7 +11150,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11148,7 +11169,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/config.guess b/config.guess index 0967f2a..2e9ad7f 100755 --- a/config.guess +++ b/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-04-02' +timestamp='2016-10-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in - arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) + earm*) + os=netbsdelf + ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -997,6 +1000,9 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1029,6 +1035,9 @@ EOF ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1408,18 +1417,17 @@ esac cat >&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff --git a/config.h.in b/config.h.in index 2438b4a..6d4b3b9 100644 --- a/config.h.in +++ b/config.h.in @@ -28,6 +28,14 @@ /* Defined if a `byte' is typedef'd */ #undef HAVE_BYTE_TYPEDEF +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + /* Define to 1 if you have the `dcgettext' function. */ #undef HAVE_DCGETTEXT @@ -93,6 +101,9 @@ /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES +/* Define if libnm is available */ +#undef HAVE_LIBNM + /* Define to 1 if you have the `pam' library (-lpam). */ #undef HAVE_LIBPAM diff --git a/config.sub b/config.sub index 8d39c4b..dd2ca93 100755 --- a/config.sub +++ b/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-03-30' +timestamp='2016-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -117,7 +117,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -301,6 +301,7 @@ case $basic_machine in | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -428,6 +429,7 @@ case $basic_machine in | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ @@ -643,6 +645,14 @@ case $basic_machine in basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -1022,7 +1032,7 @@ case $basic_machine in ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1032,7 +1042,7 @@ case $basic_machine in ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1389,7 +1399,7 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ @@ -1399,7 +1409,7 @@ case $os in | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff --git a/configure b/configure index 6dfef30..4c91d2b 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.69 for krb5-auth-dialog 3.20.0. +# Generated by GNU Autoconf 2.69 for krb5-auth-dialog 3.26.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='krb5-auth-dialog' PACKAGE_TARNAME='krb5-auth-dialog' -PACKAGE_VERSION='3.20.0' -PACKAGE_STRING='krb5-auth-dialog 3.20.0' +PACKAGE_VERSION='3.26.0' +PACKAGE_STRING='krb5-auth-dialog 3.26.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -717,14 +717,14 @@ PO_IN_DATADIR_TRUE INTLLIBS INSTOBJEXT GMOFILES +DATADIRNAME CATOBJEXT CATALOGS MSGFMT_OPTS +INTL_MACOSX_LIBS EGREP GREP CPP -GETTEXT_PACKAGE -DATADIRNAME am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -742,6 +742,7 @@ CPPFLAGS LDFLAGS CFLAGS CC +GETTEXT_PACKAGE ALL_LINGUAS INTLTOOL_PERL GMSGFMT @@ -1449,7 +1450,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures krb5-auth-dialog 3.20.0 to adapt to many kinds of systems. +\`configure' configures krb5-auth-dialog 3.26.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1521,7 +1522,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of krb5-auth-dialog 3.20.0:";; + short | recursive ) echo "Configuration of krb5-auth-dialog 3.26.0:";; esac cat <<\_ACEOF @@ -1679,7 +1680,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -krb5-auth-dialog configure 3.20.0 +krb5-auth-dialog configure 3.26.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1731,119 +1732,6 @@ fi } # ac_fn_c_try_compile -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_func - # ac_fn_c_try_cpp LINENO # ---------------------- # Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -2041,6 +1929,119 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_header_compile +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES # ---------------------------------------------------- # Tries to find if the field MEMBER exists in type AGGR, after including @@ -2101,7 +2102,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by krb5-auth-dialog $as_me 3.20.0, which was +It was created by krb5-auth-dialog $as_me 3.26.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2965,7 +2966,7 @@ fi # Define the identity of the package. PACKAGE='krb5-auth-dialog' - VERSION='3.20.0' + VERSION='3.26.0' cat >>confdefs.h <<_ACEOF @@ -3138,93 +3139,48 @@ fi $as_echo "$USE_NLS" >&6; } -DEPDIR="${am__leading_dot}deps" -ac_config_commands="$ac_config_commands depfiles" +case "$am__api_version" in + 1.01234) + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + ;; + *) + ;; +esac -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "0.35.0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 +$as_echo_n "checking for intltool >= 0.35.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 +$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 +# Extract the first word of "intltool-update", so it can be a program name with args. +set dummy intltool-update; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $INTLTOOL_UPDATE in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" + ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3232,39 +3188,39 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } +INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE +if test -n "$INTLTOOL_UPDATE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 +$as_echo "$INTLTOOL_UPDATE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 +# Extract the first word of "intltool-merge", so it can be a program name with args. +set dummy intltool-merge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $INTLTOOL_MERGE in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" + ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3272,52 +3228,39 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } +INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE +if test -n "$INTLTOOL_MERGE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 +$as_echo "$INTLTOOL_MERGE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 +# Extract the first word of "intltool-extract", so it can be a program name with args. +set dummy intltool-extract; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $INTLTOOL_EXTRACT in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" + ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3325,98 +3268,183 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } +INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT +if test -n "$INTLTOOL_EXTRACT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 +$as_echo "$INTLTOOL_EXTRACT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - fi +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# Check the gettext tools to make sure they are GNU +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $XGETTEXT in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3424,43 +3452,39 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } +XGETTEXT=$ac_cv_path_XGETTEXT +if test -n "$XGETTEXT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $MSGMERGE in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" + ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -3468,758 +3492,316 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } +MSGMERGE=$ac_cv_path_MSGMERGE +if test -n "$MSGMERGE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$ac_ct_CC" && break +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; + ;; esac - CC=$ac_ct_CC - fi fi - +MSGFMT=$ac_cv_path_MSGFMT +if test -n "$MSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 +# Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GMSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } done + done +IFS=$as_save_IFS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 +fi -ac_rmfiles= -for ac_file in $ac_files +# Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_INTLTOOL_PERL+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $INTLTOOL_PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done -rm -f $ac_rmfiles + done +IFS=$as_save_IFS -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' fi -if test -z "$ac_file"; then : +INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL +if test -n "$INTLTOOL_PERL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 +$as_echo "$INTLTOOL_PERL" >&6; } +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done + +if test -z "$INTLTOOL_PERL"; then + as_fn_error $? "perl not found" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 +$as_echo_n "checking for perl >= 5.8.1... " >&6; } +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 +$as_echo "$IT_PERL_VERSION" >&6; } +fi +if test "x" != "xno-xml"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 +$as_echo_n "checking for XML::Parser... " >&6; } + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + else + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 + fi fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; +# Substitute ALL_LINGUAS so we can use it in po/Makefile - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} + + +GETTEXT_PACKAGE=krb5-auth-dialog + + +cat >>confdefs.h <<_ACEOF +#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" _ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext + +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' else - GCC= + AMDEP_TRUE='#' + AMDEP_FALSE= fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - - - - -case "$am__api_version" in - 1.01234) - as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 - ;; - *) - ;; -esac - -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` -INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -if test -n "0.35.0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 -$as_echo_n "checking for intltool >= 0.35.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 -$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 -fi - -# Extract the first word of "intltool-update", so it can be a program name with args. -set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : - $as_echo_n "(cached) " >&6 + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - case $INTLTOOL_UPDATE in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4227,79 +3809,52 @@ done done IFS=$as_save_IFS - ;; -esac fi -INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE -if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 -$as_echo "$INTLTOOL_UPDATE" >&6; } +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - -# Extract the first word of "intltool-merge", so it can be a program name with args. -set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_MERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; esac -fi -INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE -if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 -$as_echo "$INTLTOOL_MERGE" >&6; } + CC=$ac_ct_CC + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + CC="$ac_cv_prog_CC" fi - -# Extract the first word of "intltool-extract", so it can be a program name with args. -set dummy intltool-extract; ac_word=$2 +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else - case $INTLTOOL_EXTRACT in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4307,449 +3862,857 @@ done done IFS=$as_save_IFS - ;; -esac -fi -INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT -if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 -$as_echo "$INTLTOOL_EXTRACT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 -fi - -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 fi - - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' - - - - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' - - - - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Check the gettext tools to make sure they are GNU -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else - case $XGETTEXT in - [\\/]* | ?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= - ;; -esac -fi -XGETTEXT=$ac_cv_path_XGETTEXT -if test -n "$XGETTEXT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } else + ac_file='' +fi +if test -z "$ac_file"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGMERGE+:} false; then : + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else - case $MSGMERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ;; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -MSGMERGE=$ac_cv_path_MSGMERGE -if test -n "$MSGMERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ +#ifndef __GNUC__ + choke me +#endif -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes else - case $MSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu - ;; -esac fi -MSGFMT=$ac_cv_path_MSGFMT -if test -n "$MSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + GCC= fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -# Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_PERL+:} false; then : - $as_echo_n "(cached) " >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi else - case $INTLTOOL_PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= fi -done - done -IFS=$as_save_IFS - - ;; -esac fi -INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL -if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 -$as_echo "$INTLTOOL_PERL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -if test -z "$INTLTOOL_PERL"; then - as_fn_error $? "perl not found" "$LINENO" 5 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 -$as_echo_n "checking for perl >= 5.8.1... " >&6; } -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 -else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 -$as_echo "$IT_PERL_VERSION" >&6; } +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg fi -if test "x" != "xno-xml"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 -$as_echo_n "checking for XML::Parser... " >&6; } - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - else - as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 - fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : -# Substitute ALL_LINGUAS so we can use it in po/Makefile +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - DATADIRNAME=share -else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +depcc="$CC" am_compiler_list= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -GETTEXT_PACKAGE=krb5-auth-dialog + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -_ACEOF ac_ext=c @@ -5204,6 +5167,82 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h XGETTEXT=: INTLLIBS= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFPreferencesCopyAppValue=yes +else + gt_cv_func_CFPreferencesCopyAppValue=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFLocaleCopyCurrent(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyCurrent=yes +else + gt_cv_func_CFLocaleCopyCurrent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + +$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + + + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" if test "x$ac_cv_header_libintl_h" = xyes; then : gt_cv_func_dgettext_libintl="no" @@ -5544,7 +5583,7 @@ done fi if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" + INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" fi if test "$gt_cv_have_gettext" = "yes"; then @@ -16109,12 +16148,12 @@ if test -n "$NETWORK_MANAGER_CFLAGS"; then pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib >= 0.7.999\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnm-glib >= 0.7.999") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnm") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "libnm-glib >= 0.7.999" 2>/dev/null` + pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "libnm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16126,12 +16165,12 @@ if test -n "$NETWORK_MANAGER_LIBS"; then pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib >= 0.7.999\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnm-glib >= 0.7.999") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnm") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "libnm-glib >= 0.7.999" 2>/dev/null` + pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "libnm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16152,9 +16191,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnm-glib >= 0.7.999" 2>&1` + NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnm" 2>&1` else - NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnm-glib >= 0.7.999" 2>&1` + NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnm" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$NETWORK_MANAGER_PKG_ERRORS" >&5 @@ -16169,7 +16208,10 @@ else NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_network_manager=yes + +$as_echo "#define HAVE_LIBNM 1" >>confdefs.h + + enable_network_manager=yes fi @@ -16847,6 +16889,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi + + ac_config_commands="$ac_config_commands po/stamp-it" + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -16855,10 +16901,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi - - ac_config_commands="$ac_config_commands po/stamp-it" - - if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17272,7 +17314,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by krb5-auth-dialog $as_me 3.20.0, which was +This file was extended by krb5-auth-dialog $as_me 3.26.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17338,7 +17380,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -krb5-auth-dialog config.status 3.20.0 +krb5-auth-dialog config.status 3.26.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18476,7 +18518,6 @@ $as_echo X"$file" | cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff --git a/configure.ac b/configure.ac index c12d79b..b3e2763 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([krb5-auth-dialog],[3.20.0]) +AC_INIT([krb5-auth-dialog],[3.26.0]) AC_CONFIG_SRCDIR(src/ka-kerberos.c) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz -Wno-portability]) @@ -146,8 +146,10 @@ AC_ARG_ENABLE([network-manager], AC_MSG_RESULT([$enable_network_manager]) if test "x$enable_network_manager" != "xno"; then - PKG_CHECK_MODULES([NETWORK_MANAGER],[libnm-glib >= 0.7.999], - [enable_network_manager=yes],[enable_network_manager=no]) + PKG_CHECK_MODULES([NETWORK_MANAGER],[libnm], + AC_DEFINE([HAVE_LIBNM],[1],[Define if libnm is available]) + [enable_network_manager=yes], + [enable_network_manager=no]) AC_SUBST([NETWORK_MANAGER_CFLAGS]) AC_SUBST([NETWORK_MANAGER_LIBS]) fi diff --git a/depcomp b/depcomp index fc98710..b39f98f 100755 --- a/depcomp +++ b/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/etpo/Makefile.in b/etpo/Makefile.in index 801fd66..4b10f17 100644 --- a/etpo/Makefile.in +++ b/etpo/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -250,6 +250,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ diff --git a/etpo/lexer.c b/etpo/lexer.c index c61ee5d..a58498c 100644 --- a/etpo/lexer.c +++ b/etpo/lexer.c @@ -8,7 +8,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 0 +#define YY_FLEX_SUBMINOR_VERSION 1 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -87,25 +87,13 @@ typedef unsigned int flex_uint32_t; #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ @@ -166,7 +154,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; @@ -205,7 +193,7 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. @@ -233,7 +221,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -261,7 +249,7 @@ struct yy_buffer_state /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -281,10 +269,10 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; static int yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -309,7 +297,7 @@ static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); void *yyalloc (yy_size_t ); void *yyrealloc (void *,yy_size_t ); @@ -343,7 +331,7 @@ void yyfree (void * ); typedef unsigned char YY_CHAR; -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; @@ -360,17 +348,14 @@ extern char *yytext; static yy_state_type yy_get_previous_state (void ); static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); static int yy_get_next_buffer (void ); -#if defined(__GNUC__) && __GNUC__ >= 3 -__attribute__((__noreturn__)) -#endif -static void yy_fatal_error (yyconst char msg[] ); +static void yynoreturn yy_fatal_error (yyconst char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; @@ -575,7 +560,7 @@ char *yytext; #include #include "grammar.h" -#line 579 "lexer.c" +#line 564 "lexer.c" #define INITIAL 0 #define QUOTED 1 @@ -615,7 +600,7 @@ FILE *yyget_out (void ); void yyset_out (FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng (void ); char *yyget_text (void ); @@ -674,7 +659,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -698,7 +683,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -799,7 +784,7 @@ YY_DECL { #line 34 "lexer.l" -#line 803 "lexer.c" +#line 788 "lexer.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -830,7 +815,7 @@ yy_match: if ( yy_current_state >= 121 ) yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; ++yy_cp; } while ( yy_base[yy_current_state] != 166 ); @@ -958,7 +943,7 @@ YY_RULE_SETUP #line 58 "lexer.l" ECHO; YY_BREAK -#line 962 "lexer.c" +#line 947 "lexer.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(QUOTED): yyterminate(); @@ -1104,7 +1089,7 @@ static int yy_get_next_buffer (void) { char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *source = (yytext_ptr); - yy_size_t number_to_move, i; + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1133,7 +1118,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1146,7 +1131,7 @@ static int yy_get_next_buffer (void) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1160,7 +1145,7 @@ static int yy_get_next_buffer (void) if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1173,7 +1158,7 @@ static int yy_get_next_buffer (void) } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1215,7 +1200,7 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((int) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); @@ -1256,7 +1241,7 @@ static int yy_get_next_buffer (void) if ( yy_current_state >= 121 ) yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; } return yy_current_state; @@ -1284,7 +1269,7 @@ static int yy_get_next_buffer (void) if ( yy_current_state >= 121 ) yy_c = yy_meta[(unsigned int) yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; yy_is_jam = (yy_current_state == 120); return yy_is_jam ? 0 : yy_current_state; @@ -1304,7 +1289,7 @@ static int yy_get_next_buffer (void) if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - yy_size_t number_to_move = (yy_n_chars) + 2; + int number_to_move = (yy_n_chars) + 2; char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; char *source = @@ -1316,7 +1301,7 @@ static int yy_get_next_buffer (void) yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + (yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size; if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); @@ -1355,7 +1340,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -1379,7 +1364,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { if ( yywrap( ) ) - return EOF; + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -1629,7 +1614,7 @@ void yypop_buffer_state (void) */ static void yyensure_buffer_stack (void) { - yy_size_t num_to_alloc; + int num_to_alloc; if (!(yy_buffer_stack)) { @@ -1637,15 +1622,15 @@ static void yyensure_buffer_stack (void) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -1674,7 +1659,7 @@ static void yyensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -1684,7 +1669,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) @@ -1693,7 +1678,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; @@ -1716,7 +1701,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes(yystr,(int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -1726,15 +1711,15 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; + n = (yy_size_t) (_yybytes_len + 2); buf = (char *) yyalloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -1760,7 +1745,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (yyconst char* msg ) { (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); @@ -1790,7 +1775,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -1813,7 +1798,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -1869,10 +1854,10 @@ static int yy_init_globals (void) * This function is called from yylex_destroy(), so don't allocate here. */ - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -1881,8 +1866,8 @@ static int yy_init_globals (void) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -1940,7 +1925,7 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) @@ -1953,7 +1938,7 @@ void *yyrealloc (void * ptr, yy_size_t size ) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void yyfree (void * ptr ) diff --git a/examples/Makefile.in b/examples/Makefile.in index 694539b..439acd9 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -180,6 +180,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ diff --git a/help/Makefile.am b/help/Makefile.am index cbd8ae4..c71b35b 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -15,5 +15,5 @@ HELP_MEDIA = \ figures/trayicon-expiring.png \ $(NULL) -HELP_LINGUAS = cs de el es sl sv \ +HELP_LINGUAS = cs de el es pl sl sv \ $(NULL) diff --git a/help/Makefile.in b/help/Makefile.in index f904479..e30bd7e 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -180,6 +180,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ @@ -323,7 +324,7 @@ HELP_MEDIA = \ figures/trayicon-expiring.png \ $(NULL) -HELP_LINGUAS = cs de el es sl sv \ +HELP_LINGUAS = cs de el es pl sl sv \ $(NULL) all: all-am diff --git a/help/pl/index.docbook b/help/pl/index.docbook new file mode 100644 index 0000000..bc7a1e8 --- /dev/null +++ b/help/pl/index.docbook @@ -0,0 +1,341 @@ + + + + + + + +&app;"> +]> + + + +
+ + + + + Podręcznik <application>okna dialogowego uwierzytelniania w sieci Kerberos</application> + + Okno dialogowe uwierzytelniania w sieci Kerberos to mały program pomocniczy monitorujący i odświeżający bilet Kerberos. + + 2009 Guido Günther + + + + + Guido Günther + + + + Udziela się zezwolenia na kopiowanie, rozpowszechnianie i/lub modyfikację tego dokumentu zgodnie z zasadami Licencji GNU Wolnej Dokumentacji w wersji 1.1 lub dowolnej późniejszej opublikowanej przez Free Software Foundation; bez Sekcji Niezmiennych, bez Tekstu na Przedniej Okładce i bez Tekstu na Tylnej Okładce. Egzemplarz licencji dostępny jest pod tym odnośnikiem oraz w pliku COPYING-DOCS rozprowadzanym z niniejszym podręcznikiem. + Ten podręcznik jest częścią kolekcji podręczników użytkownika GNOME rozprowadzanych na zasadach GFDL. Jeśli chcesz rozpowszechniać ten podręcznik w odłączeniu od kolekcji, możesz to zrobić dodając kopię licencji do podręcznika, jak wyjaśniono to w sekcji 6. licencji. + + Nazwy używane przez firmy, by wyróżniać swoje produkty i usługi są zazwyczaj zarejestrowanymi znakami towarowymi. Jeśli występują one w dokumentacji GNOME, w przypadku gdy są znane przez członków Projektu Dokumentacji GNOME, są one napisane wielkimi literami lub zaczynają się od wielkiej litery. + + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: + + DOCUMENT IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND + + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. + + + + + + + + Jonathan Blandford rjb@redhat.com + Guido Günther agx@sigxcpu.org + + + + + + + + + + + + + + 2.0 maj 2009 + Guido Günther agx@sigxcpu.org + + + Ten podręcznik opisuje, jak używać okna dialogowego uwierzytelniania w sieci Kerberos do zarządzania biletami Kerberos. + + Informacje zwrotne + W systemie Bugzilla projektu GNOME można zgłosić błąd lub sugestię na temat tego pakietu lub tego podręcznika (w języku angielskim). + + + + + + Piotr Drąg + + piotrdrag@gmail.com + + + + 2017 + + Piotr Drąg + + + + + Aviary.pl + + community-poland@mozilla.org + + + + 2017 + + Aviary.pl + + + + + +
+ Wprowadzenie + Okno dialogowe uwierzytelniania w sieci Kerberos Podręcznik krb5-auth-dialog + + Okno dialogowe uwierzytelniania w sieci Kerberos to aplet dla środowiska GNOME monitorujący i odświeżający bilet Kerberos. Wyświetla przypomnienia, kiedy bilet niedługo wygaśnie. + Po uzyskaniu biletu Kerberos — za pomocą GDM lub apletu — aplet będzie obsługiwał jego odnawianie do wygaśnięcia. Może też być używany do niszczenia (usuwania) bufora danych uwierzytelniania, aby uzyskać bilet za pomocą innych opcji lub przełączyć na innego naczelnika. +
+ +
+ Użycie + Okno dialogowe uwierzytelniania w sieci Kerberos jest zwykle uruchamiane podczas włączania środowiska GNOME, ale może zostać uruchomione ręcznie: + + + Wiersz poleceń + + Wpisz krb5-auth-dialog, a następnie naciśnij klawisz Enter: + + + + Ikona w obszarze powiadamiania wskazuje jeden z trzech stanów: + +
+ Prawidłowy bilet Kerberos + Użytkownik ma prawidłowy bilet Kerberos, który może być używany do uwierzytelnienia w usługach sieciowych. +
+ Prawidłowy bilet Kerberos + + + + + + + +
+
+ +
+ Bilet Kerberos wygasa + Bilet Kerberos niedługo wygaśnie, ale może nadal być używany do uwierzytelniania w usługach sieciowych. +
+ Bilet Kerberos wygasa + + + + + + + +
+
+
+ Bilet Kerberos wygasł + Kerberos jest nieprawidłowy (tzn. wygasł). Nie może już być używany do uwierzytelniania w usługach sieciowych. Nie jest to problemem, jeśli program wymagający Kerberosa potrafi zażądać nowego biletu za pomocą okna dialogowego uwierzytelniania w sieci Kerberos. Jeśli nie potrafi, to można po prostu kliknąć aplet lewym przyciskiem myszy i ponownie wpisać hasło. +
+ Bilet Kerberos wygasł + + + + + + + +
+
+
+ +
+ Powiadomienia + Po uruchomieniu okna dialogowego uwierzytelniania w sieci Kerberos mogą pojawić się poniższe powiadomienia. + +
+ Dane uwierzytelniania Kerberos są prawidłowe + Właśnie uzyskano prawidłowy bilet Kerberos, który może być używany do uwierzytelniania w usługach sieciowych. +
+ Powiadomienie o uzyskaniu prawidłowych danych uwierzytelniających Kerberos + + + + + + + +
+
+ +
+ Dane uwierzytelniające Kerberos wygasają + Dane uwierzytelniające Kerberos niedługo wygasną. Można kliknąć aplet w obszarze powiadamiania lewym przyciskiem myszy, aby je odświeżyć. +
+ Powiadomienie o wygasaniu danych uwierzytelniających Kerberos + + + + + + + +
+
+ +
+ Dane uwierzytelniające Kerberos wygasły + Dane uwierzytelniające Kerberos właśnie wygasły. Nie można ich już używać do uwierzytelniania w usługach sieciowych. +
+ Powiadomienie o wygaśnięciu danych uwierzytelniających Kerberos + + + + + + + +
+
+
+ +
+ Preferencje + Można ustawić preferencje wybierając „Preferencje” z menu kontekstowego apletu lub wybierając „Uwierzytelnianie sieciowe” w Centrum sterowania. + Preferencje naczelnika Kerberos + + + + + Element okna dialogowego + + + Opis + + + + + + + Naczelnik Kerberos + + + Używany naczelnik Kerberos. Pozostawienie pustego pola spowoduje użycie bieżącej nazwy użytkownika. Po zmianie tego ustawienia należy usunąć bufor danych uwierzytelniających. + + + + + + Identyfikator użytkownika PKINIT + + + Identyfikator publiczny/prywatny/certyfikatu naczelnika. Pozostawienie pustego pola wyłącza PKINIT. Aby włączyć za pomocą tokena zabezpieczeń, dodaj tutaj ścieżkę do biblioteki pkcs11, np. „PKCS11:/usr/lib/opensc/opensc-pkcs11.so”. + + + + + Kotwice PKINIT + + + Ścieżka do certyfikatów CA używanych jako kotwice zaufania dla pkinit. Należy to ustawić tylko, jeśli nie zostało ustawione globalnie w pliku /etc/krb5.conf. + + + + + przekazywalne + + + Czy żądany bilet Kerberos ma być przekazywalny. Zmiana tego ustawienia wymaga ponownego uwierzytelnienia klikając ikonę w obszarze powiadamiania lewym przyciskiem myszy i wpisując hasło. + + + + + odnawialne + + + Czy żądany bilet Kerberos ma być odnawialny. Zmiana tego ustawienia wymaga ponownego uwierzytelnienia klikając ikonę w obszarze powiadamiania lewym przyciskiem myszy i wpisując hasło. + + + + + mogą pośredniczyć + + + Czy żądany bilet Kerberos może pośredniczyć. Zmiana tego ustawienia wymaga ponownego uwierzytelnienia klikając ikonę w obszarze powiadamiania lewym przyciskiem myszy i wpisując hasło. + + + + + Ostrzeganie … minut przed wygaśnięciem + + + Powiadomienia o wygaśnięciu danych uwierzytelniających będą wysyłane o tyle minut przed wygaśnięciem. + + + + + Ikona w obszarze powiadamiania + + + Czy wyświetlać ikonę w obszarze powiadamiania. Wyłączenie ikony wyłączy także powiadomienia. Zamiast nich będzie wyświetlane okno dialogowe hasła. + + + + +
+
+ +
diff --git a/help/pl/legal.xml b/help/pl/legal.xml new file mode 100644 index 0000000..d797e6d --- /dev/null +++ b/help/pl/legal.xml @@ -0,0 +1,16 @@ + + + Udziela się zezwolenia na kopiowanie, rozpowszechnianie i/lub modyfikację tego dokumentu zgodnie z zasadami Licencji GNU Wolnej Dokumentacji w wersji 1.1 lub dowolnej późniejszej opublikowanej przez Free Software Foundation; bez Sekcji Niezmiennych, bez Tekstu na Przedniej Okładce i bez Tekstu na Tylnej Okładce. Egzemplarz licencji dostępny jest pod tym odnośnikiem oraz w pliku COPYING-DOCS rozprowadzanym z niniejszym podręcznikiem. + Ten podręcznik jest częścią kolekcji podręczników użytkownika GNOME rozprowadzanych na zasadach GFDL. Jeśli chcesz rozpowszechniać ten podręcznik w odłączeniu od kolekcji, możesz to zrobić dodając kopię licencji do podręcznika, jak wyjaśniono to w sekcji 6. licencji. + + Nazwy używane przez firmy, by wyróżniać swoje produkty i usługi są zazwyczaj zarejestrowanymi znakami towarowymi. Jeśli występują one w dokumentacji GNOME, w przypadku gdy są znane przez członków Projektu Dokumentacji GNOME, są one napisane wielkimi literami lub zaczynają się od wielkiej litery. + + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: + + DOCUMENT IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND + + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. + + + diff --git a/help/pl/pl.po b/help/pl/pl.po new file mode 100644 index 0000000..a11c870 --- /dev/null +++ b/help/pl/pl.po @@ -0,0 +1,667 @@ +# Polish translation for krb5-auth-dialog help. +# Copyright © 2017 the krb5-auth-dialog authors. +# This file is distributed under the same license as the krb5-auth-dialog package. +# Piotr Drąg , 2017. +# Aviary.pl , 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: krb5-auth-dialog-help\n" +"POT-Creation-Date: 2017-02-26 08:19+0000\n" +"PO-Revision-Date: 2017-06-04 18:23+0200\n" +"Last-Translator: Piotr Drąg \n" +"Language-Team: Polish \n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" + +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "" +"Piotr Drąg , 2017\n" +"Aviary.pl , 2017" + +#. (itstool) path: articleinfo/title +#: C/index.docbook:39 +msgid "" +"Kerberos Network Authentication Dialog Manual" +msgstr "" +"Podręcznik okna dialogowego uwierzytelniania w sieci Kerberos" + +#. (itstool) path: abstract/para +#: C/index.docbook:41 +msgid "" +"Kerberos Network Authentication Dialog is a small helper that monitors and " +"refreshes your Kerberos ticket." +msgstr "" +"Okno dialogowe uwierzytelniania w sieci Kerberos to mały program pomocniczy " +"monitorujący i odświeżający bilet Kerberos." + +#. (itstool) path: articleinfo/copyright +#: C/index.docbook:45 +msgid "2009 Guido Günther" +msgstr "2009 Guido Günther" + +#. (itstool) path: publisher/publishername +#: C/index.docbook:62 +msgid "Guido Günther" +msgstr "Guido Günther" + +#. (itstool) path: legalnotice/para +#: C/index.docbook:2 +msgid "" +"Permission is granted to copy, distribute and/or modify this document under " +"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " +"later version published by the Free Software Foundation with no Invariant " +"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " +"of the GFDL at this link or " +"in the file COPYING-DOCS distributed with this manual." +msgstr "" +"Udziela się zezwolenia na kopiowanie, rozpowszechnianie i/lub modyfikację " +"tego dokumentu zgodnie z zasadami Licencji GNU Wolnej Dokumentacji w wersji " +"1.1 lub dowolnej późniejszej opublikowanej przez Free Software Foundation; " +"bez Sekcji Niezmiennych, bez Tekstu na Przedniej Okładce i bez Tekstu na " +"Tylnej Okładce. Egzemplarz licencji dostępny jest pod tym odnośnikiem oraz w pliku COPYING-DOCS " +"rozprowadzanym z niniejszym podręcznikiem." + +#. (itstool) path: legalnotice/para +#: C/index.docbook:12 C/legal.xml:12 +msgid "" +"This manual is part of a collection of GNOME manuals distributed under the " +"GFDL. If you want to distribute this manual separately from the collection, " +"you can do so by adding a copy of the license to the manual, as described in " +"section 6 of the license." +msgstr "" +"Ten podręcznik jest częścią kolekcji podręczników użytkownika GNOME " +"rozprowadzanych na zasadach GFDL. Jeśli chcesz rozpowszechniać ten " +"podręcznik w odłączeniu od kolekcji, możesz to zrobić dodając kopię licencji " +"do podręcznika, jak wyjaśniono to w sekcji 6. licencji." + +#. (itstool) path: legalnotice/para +#: C/index.docbook:19 C/legal.xml:19 +msgid "" +"Many of the names used by companies to distinguish their products and " +"services are claimed as trademarks. Where those names appear in any GNOME " +"documentation, and the members of the GNOME Documentation Project are made " +"aware of those trademarks, then the names are in capital letters or initial " +"capital letters." +msgstr "" +"Nazwy używane przez firmy, by wyróżniać swoje produkty i usługi są zazwyczaj " +"zarejestrowanymi znakami towarowymi. Jeśli występują one w dokumentacji " +"GNOME, w przypadku gdy są znane przez członków Projektu Dokumentacji GNOME, " +"są one napisane wielkimi literami lub zaczynają się od wielkiej litery." + +#. (itstool) path: listitem/para +#: C/index.docbook:35 C/legal.xml:35 +msgid "" +"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " +"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " +"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS " +"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE " +"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR " +"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR " +"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL " +"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY " +"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN " +"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION " +"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "" +"DOCUMENT IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTY OF ANY KIND, " +"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " +"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS " +"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE " +"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR " +"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR " +"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL " +"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY " +"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN " +"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION " +"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" + +#. (itstool) path: listitem/para +#: C/index.docbook:55 C/legal.xml:55 +msgid "" +"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " +"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " +"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE " +"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON " +"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF " +"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, " +"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES " +"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED " +"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE " +"POSSIBILITY OF SUCH DAMAGES." +msgstr "" +"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " +"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " +"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE " +"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON " +"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF " +"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, " +"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES " +"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED " +"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE " +"POSSIBILITY OF SUCH DAMAGES." + +#. (itstool) path: legalnotice/para +#: C/index.docbook:28 C/legal.xml:28 +msgid "" +"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS " +"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +"<_:orderedlist-1/>" +msgstr "" +"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS " +"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +"<_:orderedlist-1/>" + +#. (itstool) path: authorgroup/author +#: C/index.docbook:68 +msgid "" +"Jonathan Blandford " +"rjb@redhat.com" +msgstr "" +"Jonathan Blandford " +"rjb@redhat.com" + +#. (itstool) path: authorgroup/author +#: C/index.docbook:73 +msgid "" +"Guido Günther agx@sigxcpu." +"org" +msgstr "" +"Guido Günther agx@sigxcpu." +"org" + +#. (itstool) path: revdescription/para +#: C/index.docbook:106 +msgid "Guido Günther agx@sigxcpu.org" +msgstr "Guido Günther agx@sigxcpu.org" + +#. (itstool) path: revhistory/revision +#: C/index.docbook:102 +msgid "2.0 May 2009 <_:revdescription-1/>" +msgstr "2.0 maj 2009 <_:revdescription-1/>" + +#. (itstool) path: articleinfo/releaseinfo +#: C/index.docbook:112 +msgid "" +"This manual describes how to use the Kerberos Network Authentication Dialog " +"to manage your Kerberos tickets." +msgstr "" +"Ten podręcznik opisuje, jak używać okna dialogowego uwierzytelniania w sieci " +"Kerberos do zarządzania biletami Kerberos." + +#. (itstool) path: legalnotice/title +#: C/index.docbook:116 +msgid "Feedback" +msgstr "Informacje zwrotne" + +#. (itstool) path: legalnotice/para +#: C/index.docbook:117 +msgid "" +"To report a bug or make a suggestion regarding this package or this manual, " +"use GNOME's Bugzilla." +msgstr "" +"W systemie Bugzilla projektu GNOME można zgłosić błąd lub sugestię na temat tego pakietu " +"lub tego podręcznika (w języku angielskim)." + +#. (itstool) path: section/title +#: C/index.docbook:129 +msgid "Introduction" +msgstr "Wprowadzenie" + +#. (itstool) path: section/indexterm +#: C/index.docbook:130 +msgid "" +"Kerberos Network Authentication Dialog Manual krb5-auth-dialog" +msgstr "" +"Okno dialogowe uwierzytelniania w sieci Kerberos Podręcznik krb5-auth-" +"dialog" + +#. (itstool) path: section/para +#: C/index.docbook:136 +msgid "" +"Kerberos Network Authentication Dialog is an applet for the " +"GNOME desktop that monitors and refreshes your " +"Kerberos ticket. It pops up reminders when the ticket is about to expire." +msgstr "" +"Okno dialogowe uwierzytelniania w sieci Kerberos to aplet dla " +"środowiska GNOME monitorujący i odświeżający bilet " +"Kerberos. Wyświetla przypomnienia, kiedy bilet niedługo wygaśnie." + +#. (itstool) path: section/para +#: C/index.docbook:141 +msgid "" +"Once you have acquired a Kerberos ticket - be it via GDM or via the applet " +"itself - the applet will handle the ticket's renewal until it expires. It " +"can also be used to destroy (remove) the credential cache, to acquire a " +"ticket with different options or to switch to another principal." +msgstr "" +"Po uzyskaniu biletu Kerberos — za pomocą GDM lub apletu — aplet będzie " +"obsługiwał jego odnawianie do wygaśnięcia. Może też być używany do " +"niszczenia (usuwania) bufora danych uwierzytelniania, aby uzyskać bilet za " +"pomocą innych opcji lub przełączyć na innego naczelnika." + +#. (itstool) path: section/title +#: C/index.docbook:146 +msgid "Usage" +msgstr "Użycie" + +#. (itstool) path: section/para +#: C/index.docbook:147 +msgid "" +"Kerberos Network Authentication Dialog is usually " +"started in GNOME startup, but you can manually start Kerberos " +"Network Authentication Dialog by doing:" +msgstr "" +"Okno dialogowe uwierzytelniania w sieci Kerberos " +"jest zwykle uruchamiane podczas włączania środowiska GNOME, ale może zostać " +"uruchomione ręcznie:" + +#. (itstool) path: varlistentry/term +#: C/index.docbook:153 +msgid "Command line" +msgstr "Wiersz poleceń" + +#. (itstool) path: listitem/para +#: C/index.docbook:155 +msgid "" +"Type krb5-auth-dialog, then press Return:" +msgstr "" +"Wpisz krb5-auth-dialog, a następnie naciśnij klawisz " +"Enter:" + +#. (itstool) path: section/para +#: C/index.docbook:162 +msgid "The tray icon will indicate one of three states:" +msgstr "Ikona w obszarze powiadamiania wskazuje jeden z trzech stanów:" + +#. (itstool) path: section/title +#. (itstool) path: figure/title +#: C/index.docbook:167 C/index.docbook:170 +msgid "Valid Kerberos ticket" +msgstr "Prawidłowy bilet Kerberos" + +#. (itstool) path: section/para +#: C/index.docbook:168 +msgid "" +"You have a valid Kerberos ticket that can be used to authenticate to network " +"services." +msgstr "" +"Użytkownik ma prawidłowy bilet Kerberos, który może być używany do " +"uwierzytelnienia w usługach sieciowych." + +#. (itstool) path: imageobject/imagedata +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.docbook:174 +msgctxt "_" +msgid "" +"external ref='figures/trayicon-valid.png' " +"md5='78989c41fd36e23c0a97b87a2cc440e4'" +msgstr "" +"external ref='figures/trayicon-valid.png' " +"md5='78989c41fd36e23c0a97b87a2cc440e4'" + +#. (itstool) path: section/title +#. (itstool) path: figure/title +#: C/index.docbook:182 C/index.docbook:185 +msgid "Kerberos ticket expiring" +msgstr "Bilet Kerberos wygasa" + +#. (itstool) path: section/para +#: C/index.docbook:183 +msgid "" +"The Kerberos ticket is about to expire but it can still be used to " +"authenticate to network services." +msgstr "" +"Bilet Kerberos niedługo wygaśnie, ale może nadal być używany do " +"uwierzytelniania w usługach sieciowych." + +#. (itstool) path: imageobject/imagedata +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.docbook:189 +msgctxt "_" +msgid "" +"external ref='figures/trayicon-expiring.png' " +"md5='cb1dbed310e568e7cb4684bac85c6969'" +msgstr "" +"external ref='figures/trayicon-expiring.png' " +"md5='cb1dbed310e568e7cb4684bac85c6969'" + +#. (itstool) path: section/title +#. (itstool) path: figure/title +#: C/index.docbook:196 C/index.docbook:200 +msgid "Kerberos ticket expired" +msgstr "Bilet Kerberos wygasł" + +#. (itstool) path: section/para +#: C/index.docbook:197 +msgid "" +"Your Kerberos became invalid (e.g. expired). It can no longer be used to " +"authenticate to network services. This is not a problem if the application " +"that requires Kerberos knows how to request a new ticket via " +"Kerberos Network Authentication Dialog. In case " +"it doesn't you can just left click on the applet an reenter your password." +msgstr "" +"Kerberos jest nieprawidłowy (tzn. wygasł). Nie może już być używany do " +"uwierzytelniania w usługach sieciowych. Nie jest to problemem, jeśli program " +"wymagający Kerberosa potrafi zażądać nowego biletu za pomocą " +"okna dialogowego uwierzytelniania w sieci Kerberos. Jeśli nie potrafi, to można po prostu kliknąć aplet lewym " +"przyciskiem myszy i ponownie wpisać hasło." + +#. (itstool) path: imageobject/imagedata +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.docbook:204 +msgctxt "_" +msgid "" +"external ref='figures/trayicon-expired.png' " +"md5='40c03749e8e3773a0e931232a89e3fe2'" +msgstr "" +"external ref='figures/trayicon-expired.png' " +"md5='40c03749e8e3773a0e931232a89e3fe2'" + +#. (itstool) path: section/title +#: C/index.docbook:213 +msgid "Notification Messages" +msgstr "Powiadomienia" + +#. (itstool) path: section/para +#: C/index.docbook:214 +msgid "" +"When Kerberos Network Authentication Dialog has started, the following " +"notifications may be displayed." +msgstr "" +"Po uruchomieniu okna dialogowego uwierzytelniania w sieci Kerberos mogą " +"pojawić się poniższe powiadomienia." + +#. (itstool) path: section/title +#: C/index.docbook:219 +msgid "Kerberos credentials valid" +msgstr "Dane uwierzytelniania Kerberos są prawidłowe" + +#. (itstool) path: section/para +#: C/index.docbook:220 +msgid "" +"You just acquired a valid Kerberos ticket that can be used to authenticate " +"to network services." +msgstr "" +"Właśnie uzyskano prawidłowy bilet Kerberos, który może być używany do " +"uwierzytelniania w usługach sieciowych." + +#. (itstool) path: figure/title +#: C/index.docbook:222 +msgid "Notification when Kerberos credentials become valid" +msgstr "" +"Powiadomienie o uzyskaniu prawidłowych danych uwierzytelniających Kerberos" + +#. (itstool) path: imageobject/imagedata +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.docbook:226 +msgctxt "_" +msgid "" +"external ref='figures/ka-valid.png' md5='143d137c326eeba1ec48cba8f5805cc1'" +msgstr "" +"external ref='figures/ka-valid.png' md5='143d137c326eeba1ec48cba8f5805cc1'" + +#. (itstool) path: section/title +#: C/index.docbook:234 +msgid "Kerberos credentials expiring" +msgstr "Dane uwierzytelniające Kerberos wygasają" + +#. (itstool) path: section/para +#: C/index.docbook:235 +msgid "" +"Your Kerberos credentials are about to expire. You can left click on the " +"tray applet to refresh them." +msgstr "" +"Dane uwierzytelniające Kerberos niedługo wygasną. Można kliknąć aplet " +"w obszarze powiadamiania lewym przyciskiem myszy, aby je odświeżyć." + +#. (itstool) path: figure/title +#: C/index.docbook:237 +msgid "Notification when Kerberos credentials expiring" +msgstr "Powiadomienie o wygasaniu danych uwierzytelniających Kerberos" + +#. (itstool) path: imageobject/imagedata +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.docbook:241 +msgctxt "_" +msgid "" +"external ref='figures/ka-expiring.png' md5='37bb5e8f591c8c7fdb6345b8793e76fb'" +msgstr "" +"external ref='figures/ka-expiring.png' md5='37bb5e8f591c8c7fdb6345b8793e76fb'" + +#. (itstool) path: section/title +#: C/index.docbook:249 +msgid "Kerberos credentials expired" +msgstr "Dane uwierzytelniające Kerberos wygasły" + +#. (itstool) path: section/para +#: C/index.docbook:250 +msgid "" +"Your Kerberos credentials just expired. They can no longer be used to " +"authenticate to network services." +msgstr "" +"Dane uwierzytelniające Kerberos właśnie wygasły. Nie można ich już używać do " +"uwierzytelniania w usługach sieciowych." + +#. (itstool) path: figure/title +#: C/index.docbook:252 +msgid "Notification when Kerberos credentials expired" +msgstr "Powiadomienie o wygaśnięciu danych uwierzytelniających Kerberos" + +#. (itstool) path: imageobject/imagedata +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.docbook:256 +msgctxt "_" +msgid "" +"external ref='figures/ka-expired.png' md5='1e92acc36db8643c6c43473f54f8029f'" +msgstr "" +"external ref='figures/ka-expired.png' md5='1e92acc36db8643c6c43473f54f8029f'" + +#. (itstool) path: section/title +#: C/index.docbook:265 +msgid "Preferences" +msgstr "Preferencje" + +#. (itstool) path: table/title +#: C/index.docbook:269 +msgid "Kerberos Principal Preferences" +msgstr "Preferencje naczelnika Kerberos" + +#. (itstool) path: entry/para +#: C/index.docbook:274 +msgid "Dialog Element" +msgstr "Element okna dialogowego" + +#. (itstool) path: entry/para +#: C/index.docbook:277 +msgid "Description" +msgstr "Opis" + +#. (itstool) path: entry/para +#: C/index.docbook:284 +msgid "Kerberos Principal" +msgstr "Naczelnik Kerberos" + +#. (itstool) path: entry/para +#: C/index.docbook:289 +msgid "" +"The Kerberos principal to use. Leave blank to use you current username. If " +"you change this setting you have to destroy the credential cache before " +"these setting takes effect." +msgstr "" +"Używany naczelnik Kerberos. Pozostawienie pustego pola spowoduje użycie " +"bieżącej nazwy użytkownika. Po zmianie tego ustawienia należy usunąć bufor " +"danych uwierzytelniających." + +#. (itstool) path: entry/para +#: C/index.docbook:295 +msgid "PKINIT Userid" +msgstr "Identyfikator użytkownika PKINIT" + +#. (itstool) path: entry/para +#: C/index.docbook:300 +msgid "" +"The principals public/private/certificate identifier. Leave empty if not " +"using PKINIT. To enable using a security token add the path to the pkcs11 " +"Library here, e.g. \"PKCS11:/usr/lib/opensc/opensc-pkcs11.so\"" +msgstr "" +"Identyfikator publiczny/prywatny/certyfikatu naczelnika. Pozostawienie " +"pustego pola wyłącza PKINIT. Aby włączyć za pomocą tokena zabezpieczeń, " +"dodaj tutaj ścieżkę do biblioteki pkcs11, np. „PKCS11:/usr/lib/opensc/opensc-" +"pkcs11.so”." + +#. (itstool) path: entry/para +#: C/index.docbook:305 +msgid "PKINIT anchors" +msgstr "Kotwice PKINIT" + +#. (itstool) path: entry/para +#: C/index.docbook:310 +msgid "" +"Path to CA certificates used as trust anchors for pkinit. You only need to " +"set this if it hasn't been set up globally in /etc/krb5.conf" +msgstr "" +"Ścieżka do certyfikatów CA używanych jako kotwice zaufania dla pkinit. " +"Należy to ustawić tylko, jeśli nie zostało ustawione globalnie w pliku " +"/etc/krb5.conf." + +#. (itstool) path: entry/para +#: C/index.docbook:315 +msgid "forwardable" +msgstr "przekazywalne" + +#. (itstool) path: entry/para +#: C/index.docbook:320 +msgid "" +"Whether the requested Kerberos ticket should be forwardable. Changing this " +"setting requires to you to reauthenticate by left clicking on the tray icon " +"and entering your password." +msgstr "" +"Czy żądany bilet Kerberos ma być przekazywalny. Zmiana tego ustawienia " +"wymaga ponownego uwierzytelnienia klikając ikonę w obszarze powiadamiania " +"lewym przyciskiem myszy i wpisując hasło." + +#. (itstool) path: entry/para +#: C/index.docbook:325 +msgid "renewable" +msgstr "odnawialne" + +#. (itstool) path: entry/para +#: C/index.docbook:330 +msgid "" +"Whether the requested Kerberos ticket should be renewable. Changing this " +"setting requires to you to reauthenticate by left clicking on the tray icon " +"and entering your password." +msgstr "" +"Czy żądany bilet Kerberos ma być odnawialny. Zmiana tego ustawienia wymaga " +"ponownego uwierzytelnienia klikając ikonę w obszarze powiadamiania lewym " +"przyciskiem myszy i wpisując hasło." + +#. (itstool) path: entry/para +#: C/index.docbook:335 +msgid "proxiable" +msgstr "mogą pośredniczyć" + +#. (itstool) path: entry/para +#: C/index.docbook:340 +msgid "" +"Whether the requested Kerberos ticket should be proxiable. Changing this " +"setting requires to you to reauthenticate by left clicking on the tray icon " +"and entering your password." +msgstr "" +"Czy żądany bilet Kerberos może pośredniczyć. Zmiana tego ustawienia wymaga " +"ponownego uwierzytelnienia klikając ikonę w obszarze powiadamiania lewym " +"przyciskiem myszy i wpisując hasło." + +#. (itstool) path: entry/para +#: C/index.docbook:345 +msgid "Warn .. minutes before expiry" +msgstr "Ostrzeganie … minut przed wygaśnięciem" + +#. (itstool) path: entry/para +#: C/index.docbook:350 +msgid "" +"Notifications that your credentials are about to expire will be sent that " +"many minutes before expiry." +msgstr "" +"Powiadomienia o wygaśnięciu danych uwierzytelniających będą wysyłane o tyle " +"minut przed wygaśnięciem." + +#. (itstool) path: entry/para +#: C/index.docbook:355 +msgid "Show tray icon" +msgstr "Ikona w obszarze powiadamiania" + +#. (itstool) path: entry/para +#: C/index.docbook:360 +msgid "" +"Whether to show the tray icon. Disabling the tray icon will also disable " +"notifications, the password dialog will be brought up instead." +msgstr "" +"Czy wyświetlać ikonę w obszarze powiadamiania. Wyłączenie ikony wyłączy " +"także powiadomienia. Zamiast nich będzie wyświetlane okno dialogowe hasła." + +#. (itstool) path: section/para +#: C/index.docbook:266 +msgid "" +"You can set preferences by selecting \"Preferences\" from the applets " +"context menu or by selecting \"Network Authentication\" in the " +"Control Center. <_:table-1/>" +msgstr "" +"Można ustawić preferencje wybierając „Preferencje” z menu kontekstowego " +"apletu lub wybierając „Uwierzytelnianie sieciowe” w Centrum " +"sterowania. <_:table-1/>" + +#. (itstool) path: para/ulink +#: C/legal.xml:9 +msgid "link" +msgstr "odnośnikiem" + +#. (itstool) path: legalnotice/para +#: C/legal.xml:2 +msgid "" +"Permission is granted to copy, distribute and/or modify this document under " +"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " +"later version published by the Free Software Foundation with no Invariant " +"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " +"of the GFDL at this <_:ulink-1/> or in the file COPYING-DOCS distributed " +"with this manual." +msgstr "" +"Udziela się zezwolenia na kopiowanie, rozpowszechnianie i/lub modyfikację " +"tego dokumentu zgodnie z zasadami Licencji GNU Wolnej Dokumentacji w wersji " +"1.1 lub dowolnej późniejszej opublikowanej przez Free Software Foundation; " +"bez Sekcji Niezmiennych, bez Tekstu na Przedniej Okładce i bez Tekstu na " +"Tylnej Okładce. Egzemplarz licencji dostępny jest pod tym <_:ulink-1/> oraz " +"w pliku COPYING-DOCS rozprowadzanym z niniejszym podręcznikiem." diff --git a/help/pl/pl.stamp b/help/pl/pl.stamp new file mode 100644 index 0000000..e69de29 diff --git a/icons/22x22/Makefile.in b/icons/22x22/Makefile.in index 92dc9a1..52ca537 100644 --- a/icons/22x22/Makefile.in +++ b/icons/22x22/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -210,6 +210,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in index b0a3417..f0d9cb0 100644 --- a/icons/48x48/Makefile.in +++ b/icons/48x48/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -210,6 +210,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ diff --git a/icons/Makefile.in b/icons/Makefile.in index 19605a0..95dd885 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -240,6 +240,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in index e656728..875c641 100644 --- a/icons/scalable/Makefile.in +++ b/icons/scalable/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -210,6 +210,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec index 66a1ea2..6afd474 100644 --- a/krb5-auth-dialog.spec +++ b/krb5-auth-dialog.spec @@ -1,6 +1,6 @@ Summary: Kerberos 5 authentication dialog Name: krb5-auth-dialog -Version: 3.20.0 +Version: 3.26.0 Release: 1 License: GPL Group: User Interface/X diff --git a/ltmain.sh b/ltmain.sh index 147d758..a736cf9 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-0.1" +VERSION="2.4.6 Debian-2.4.6-2" package_revision=2.4.6 @@ -2068,7 +2068,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 + version: $progname $scriptversion Debian-2.4.6-2 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` diff --git a/plugins/Makefile.in b/plugins/Makefile.in index c6f6430..67bed65 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -299,6 +299,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 06a8cfe..fcd2c3b 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -33,8 +33,7 @@ exec_prefix = @exec_prefix@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -80,7 +79,7 @@ INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< @@ -108,7 +107,7 @@ install-data-no: all install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -142,8 +141,8 @@ install-exec installcheck: uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot diff --git a/po/cs.po b/po/cs.po index 950f504..1f2b378 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,15 +2,15 @@ # Copyright (C) 2010, 2011 krb5-auth-dialog's COPYRIGHT HOLDER # This file is distributed under the same license as the krb5-auth-dialog package. # -# Zdeněk Hataš , 2010 - 2015. +# Zdeněk Hataš , 2010 - 2016. # msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" "auth-dialog&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-06-10 16:57+0000\n" -"PO-Revision-Date: 2015-06-19 15:15+0100\n" +"POT-Creation-Date: 2016-10-04 19:47+0000\n" +"PO-Revision-Date: 2016-06-30 14:50+0100\n" "Last-Translator: Zdeněk Hataš \n" "Language-Team: Czech \n" "Language: cs\n" @@ -146,7 +146,7 @@ msgstr "PKINIT" msgid "Notifications" msgstr "Upozornění" -#. Used in combination: 'Warn x minutes before expiry' +#. Used in combination: #: ../src/resources/ui/ka-preferences.ui.h:24 msgid "Warn" msgstr "Upozornit" @@ -159,7 +159,7 @@ msgstr "" "Posílat oznámení o vypršení platnosti lístku tento počet minut před úplným " "vypršením platnosti" -#. Used in combination: 'Warn x minutes before expiry' +#. Used in combination: #: ../src/resources/ui/ka-preferences.ui.h:27 msgid "minutes before ticket expiry" msgstr "minut před vypršením platnosti lístku" @@ -1609,7 +1609,6 @@ msgstr "Chyba %s" #: ../src/ka-pwdialog.c:309 #, c-format -#| msgid "Couldn't acquire kerberos ticket: '%s'" msgid "Couldn't acquire Kerberos ticket: '%s'" msgstr "Nelze získat lístek Kerberos: „%s“" @@ -1641,6 +1640,14 @@ msgid "translator-credits" msgstr "Zdeněk Hataš " #: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +msgid "Kerberos Authentication Dialog" +msgstr "Dialogové okno autentizace Kerberos" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +msgid "Request, renew and view Kerberos tickets" +msgstr "Žádosti o tikety Kerberos a jejich obnovení a zobrazení" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:3 msgid "" "Kerberos Authentication allows you to list your current Kerberos tickets, " "and to request a new ticket (authenticate to the Kerberos Server). It also " @@ -1652,7 +1659,7 @@ msgstr "" "také, pokud se blíží vypršení platnosti vašich přihlašovacích údajů " "Kerberos. Pokud je to možné, dovolí vám lístek automaticky obnovit." -#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#: ../src/krb5-auth-dialog.appdata.xml.in.h:4 msgid "" "This is useful if you need to authenticate to a Kerberos Server (KDC) after " "your login to the desktop (e.g. on a mobile device)." @@ -1660,10 +1667,18 @@ msgstr "" "To je užitečné, když se potřebujete autentizovat k serveru Kerberos (KDC) " "poté, co se přihlásíte k počítači (např. na mobilním zařízení)." +#: ../src/krb5-auth-dialog.appdata.xml.in.h:5 +msgid "Kerberos authentication dialog" +msgstr "Dialogové okno autentizace Kerberos" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Dialog síťové autentizace Kerberos" +#: ../src/krb5-auth-dialog.desktop.in.h:3 +msgid "kerberos;authentication;" +msgstr "kerberos;autentizace;ověřování;" + #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:1 msgid "Kerberos principal" msgstr "Kerberos principal" diff --git a/po/da.po b/po/da.po index 69f0cf0..6d5f5b9 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # Danish translation for krb5-auth-dialog. -# Copyright (C) 2011 krb5-auth-dialog og nedenstående oversættere. +# Copyright (C) 2016 krb5-auth-dialog og nedenstående oversættere. # This file is distributed under the same license as the krb5-auth-dialog package. -# Joe Hansen , 2011, 2013. +# Joe Hansen , 2011, 2013, 2016. # # checksum -> kontrolsum # credentials -> akkreditiver @@ -14,9 +14,10 @@ msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-13 22:12+0200\n" -"PO-Revision-Date: 2013-09-11 19:00+0000\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" +"auth-dialog&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-10-04 19:47+0000\n" +"PO-Revision-Date: 2016-12-04 19:00+0000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" @@ -25,119 +26,118 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/krb5-auth-dialog.ui.h:1 +#: ../src/resources/ui/app-menu.ui.h:1 msgid "Prefere_nces" msgstr "_Indstillinger" -#: ../src/krb5-auth-dialog.ui.h:2 +#: ../src/resources/ui/app-menu.ui.h:2 msgid "_About" msgstr "_Om" -#: ../src/krb5-auth-dialog.ui.h:3 +#: ../src/resources/ui/app-menu.ui.h:3 +#: ../src/resources/ui/tray-icon-menu.ui.h:3 msgid "_Help" msgstr "_Hjælp" -#: ../src/krb5-auth-dialog.ui.h:4 +#: ../src/resources/ui/app-menu.ui.h:4 +#: ../src/resources/ui/tray-icon-menu.ui.h:4 msgid "_Quit" msgstr "_Afslut" -#. -#. * vim:ts:sts=4:sw=4:et: -#. -#: ../src/krb5-auth-dialog.ui.h:5 ../src/krb5-auth-dialog.desktop.in.h:1 -msgid "Kerberos Authentication" -msgstr "Kerberosgodkendelse" +#: ../src/resources/ui/tray-icon-menu.ui.h:1 +msgid "Remove Credentials _Cache" +msgstr "Fjern akkreditiv_mellemlager" -#: ../src/krb5-auth-dialog.ui.h:6 -msgid "_Renew Ticket" -msgstr "_Forny billet" +#: ../src/resources/ui/tray-icon-menu.ui.h:2 +msgid "_List Tickets" +msgstr "_Vis billetter" -#: ../src/krb5-auth-dialog.ui.h:7 +#: ../src/resources/ui/ka-main-window.ui.h:1 msgid "Service Tickets" msgstr "Tjenestebilletter" -#: ../src/krb5-auth-dialog.ui.h:8 +#: ../src/resources/ui/ka-preferences.ui.h:1 msgid "Kerberos User" msgstr "Kerberosbruger" # eller "nuværende brugernavn." -#: ../src/krb5-auth-dialog.ui.h:9 +#: ../src/resources/ui/ka-preferences.ui.h:2 msgid "" "The name of your Kerberos account. Leave blank to use your current username." msgstr "" "Navnet på din Kerberoskonto. Efterlad tom for at bruge dit aktuelle " "brugernavn." -#: ../src/krb5-auth-dialog.ui.h:10 +#: ../src/resources/ui/ka-preferences.ui.h:3 msgid "Kerberos principal:" msgstr "Kerberoshoved:" # Billetindstillinger for Kerberos - måske -#: ../src/krb5-auth-dialog.ui.h:11 +#: ../src/resources/ui/ka-preferences.ui.h:4 msgid "Kerberos Ticket Options" msgstr "Kerberos' billetindstillinger" -#: ../src/krb5-auth-dialog.ui.h:12 +#: ../src/resources/ui/ka-preferences.ui.h:5 msgid "Requested Kerberos tickets should be:" msgstr "De anmodne Kerberosbilletter skal være:" -#: ../src/krb5-auth-dialog.ui.h:13 +#: ../src/resources/ui/ka-preferences.ui.h:6 msgid "forwardable" msgstr "kan videresendes" -#: ../src/krb5-auth-dialog.ui.h:14 +#: ../src/resources/ui/ka-preferences.ui.h:7 msgid "If checked, request forwardable tickets" msgstr "Hvis afkrydset: Anmod om billetter som kan videresendes" -#: ../src/krb5-auth-dialog.ui.h:15 +#: ../src/resources/ui/ka-preferences.ui.h:8 msgid "renewable" msgstr "kan fornyes" -#: ../src/krb5-auth-dialog.ui.h:16 +#: ../src/resources/ui/ka-preferences.ui.h:9 msgid "If checked, request renewable tickets" msgstr "Hvis afkrydset: Anmod om billetter som kan fornyes" -#: ../src/krb5-auth-dialog.ui.h:17 +#: ../src/resources/ui/ka-preferences.ui.h:10 msgid "proxiable" msgstr "tillader proxies" -#: ../src/krb5-auth-dialog.ui.h:18 +#: ../src/resources/ui/ka-preferences.ui.h:11 msgid "If checked, request proxiable tickets" msgstr "Hvis afkrydset: Anmod om billetter som tillader proxy" -#: ../src/krb5-auth-dialog.ui.h:19 +#: ../src/resources/ui/ka-preferences.ui.h:12 msgid "Kerberos" msgstr "Kerberos" -#: ../src/krb5-auth-dialog.ui.h:20 +#: ../src/resources/ui/ka-preferences.ui.h:13 msgid "Userid" msgstr "Bruger-id" -#: ../src/krb5-auth-dialog.ui.h:21 +#: ../src/resources/ui/ka-preferences.ui.h:14 msgid "Use Smartcard" msgstr "Brug smartcard" -#: ../src/krb5-auth-dialog.ui.h:22 +#: ../src/resources/ui/ka-preferences.ui.h:15 msgid "If checked, use a security token (Smartcard) to authenticate." msgstr "Hvis afkrydset: Brug et sikkerhedssymbol (Smartcard) til godkendelsen." -#: ../src/krb5-auth-dialog.ui.h:23 +#: ../src/resources/ui/ka-preferences.ui.h:16 msgid "Certificate and private key used for authentication" msgstr "Certifikat og privat nøgle brugt for godkendelse" -#: ../src/krb5-auth-dialog.ui.h:24 +#: ../src/resources/ui/ka-preferences.ui.h:17 msgid "_Browse..." msgstr "_Gennemse..." -#: ../src/krb5-auth-dialog.ui.h:25 +#: ../src/resources/ui/ka-preferences.ui.h:18 msgid "X509 trust anchors" msgstr "X509-troværdighedsankre" -#: ../src/krb5-auth-dialog.ui.h:26 +#: ../src/resources/ui/ka-preferences.ui.h:19 msgid "Certificate used to verify digital signatures." msgstr "Certifikat brugt til at verificere digitale underskrifter." -#: ../src/krb5-auth-dialog.ui.h:27 +#: ../src/resources/ui/ka-preferences.ui.h:20 msgid "" "Configure the use of certificates and smartcards for your Kerberos network " "authentication." @@ -145,76 +145,42 @@ msgstr "" "Konfigurer brugen af certifikater og smartkort for Kerberos' " "netværksgodkendelse." -#: ../src/krb5-auth-dialog.ui.h:28 +#: ../src/resources/ui/ka-preferences.ui.h:21 msgid "PKINIT" msgstr "PKINIT" -#: ../src/krb5-auth-dialog.ui.h:29 +#: ../src/resources/ui/ka-preferences.ui.h:22 msgid "Notifications" msgstr "Påmindelser" -#. Used in combination: 'Warn x minutes before expiry' -#: ../src/krb5-auth-dialog.ui.h:31 +#. Used in combination: +#: ../src/resources/ui/ka-preferences.ui.h:24 msgid "Warn" msgstr "Advar" -#: ../src/krb5-auth-dialog.ui.h:32 +#: ../src/resources/ui/ka-preferences.ui.h:25 msgid "" "Send notification about ticket expiry that many minutes before it finally " "expires" msgstr "Send påmindelse om billetudløb med dette antal minutter før udløb" -#. Used in combination: 'Warn x minutes before expiry' -#: ../src/krb5-auth-dialog.ui.h:34 +#. Used in combination: +#: ../src/resources/ui/ka-preferences.ui.h:27 msgid "minutes before ticket expiry" msgstr "minutter før billetudløb" -#: ../src/ka-kerberos.c:177 -msgid "unknown error" -msgstr "ukendt fejl" - -# er i øjeblikket tomt -#: ../src/ka-kerberos.c:317 -msgid "Your ticket cache is currently empty" -msgstr "Dit billetmellemlager er aktuelt tomt" - -#: ../src/ka-kerberos.c:348 -msgid "Expired" -msgstr "Udløbet" - -#: ../src/ka-pwdialog.c:230 -#, c-format -msgid "Couldn't acquire kerberos ticket: '%s'" -msgstr "Kunne ikke indhente kerberosbillet: '%s'" - -#: ../src/ka-pwdialog.c:269 ../src/ka-applet.c:572 -#, c-format -msgid "Your credentials expire in %d minute" -msgid_plural "Your credentials expire in %d minutes" -msgstr[0] "Dine akkreditiver udløber om %d minut" -msgstr[1] "Dine akkreditiver udløber om %d minutter" - -#: ../src/ka-pwdialog.c:274 ../src/ka-applet.c:577 -msgid "Your credentials have expired" -msgstr "Dine akkreditiver er udløbet" - -#: ../src/ka-pwdialog.c:297 -msgid "Please enter your Kerberos password:" -msgstr "Indtast venligst din adgangskode til Kerberos:" - -#: ../src/ka-pwdialog.c:310 -#, c-format -msgid "Please enter the password for '%s':" -msgstr "Indtast venligst adgangskoden for '%s':" +#: ../src/resources/ui/ka-pwdialog.ui.h:1 +#: ../src/krb5-auth-dialog.desktop.in.h:1 +msgid "Kerberos Authentication" +msgstr "Kerberosgodkendelse" -#: ../src/ka-pwdialog.c:328 -msgid "The password you entered is invalid" -msgstr "Adgangskoden du indtastede er ugyldig" +#: ../src/resources/ui/ka-pwdialog.ui.h:2 ../src/ka-preferences.c:372 +msgid "_Cancel" +msgstr "_Afbryd" -#: ../src/ka-pwdialog.c:344 -#, c-format -msgid "%s Error" -msgstr "%s-fejl" +#: ../src/resources/ui/ka-pwdialog.ui.h:3 +msgid "_Renew Ticket" +msgstr "_Forny billet" #. Translators: files from dummy-strings.c are *all* possible errors #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in @@ -1534,124 +1500,206 @@ msgstr "Ugyldigt magital for GSSAPI OID" msgid "Bad magic number for GSSAPI QUEUE" msgstr "Ugyldigt magital for GSSAPI QUEUE" -#: ../src/ka-applet.c:566 +#: ../src/ka-applet.c:654 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Dine akkreditiver udløber om %.2d:%.2dh" -#: ../src/ka-applet.c:759 +#: ../src/ka-applet.c:660 ../src/ka-pwdialog.c:348 +#, c-format +msgid "Your credentials expire in %d minute" +msgid_plural "Your credentials expire in %d minutes" +msgstr[0] "Dine akkreditiver udløber om %d minut" +msgstr[1] "Dine akkreditiver udløber om %d minutter" + +#: ../src/ka-applet.c:665 ../src/ka-pwdialog.c:353 +msgid "Your credentials have expired" +msgstr "Dine akkreditiver er udløbet" + +#: ../src/ka-applet.c:837 msgid "List Tickets" msgstr "Vis billetter" -#: ../src/ka-applet.c:769 +#: ../src/ka-applet.c:847 msgid "Get Ticket" msgstr "Hent billet" -#: ../src/ka-applet.c:778 +#: ../src/ka-applet.c:856 msgid "Don't show me this again" msgstr "Vis mig ikke dette igen" -#: ../src/ka-applet.c:785 +#: ../src/ka-applet.c:863 msgid "Remove Credentials Cache" msgstr "Fjern akkreditivmellemlager" -#: ../src/ka-applet.c:845 +#: ../src/ka-applet.c:925 msgid "You have valid Kerberos credentials." msgstr "Du har gyldige Kerberosakkreditiver." -#: ../src/ka-applet.c:847 +#: ../src/ka-applet.c:927 msgid "You've refreshed your Kerberos credentials." msgstr "Du har opdateret dine Kerberosakkreditiver." -#: ../src/ka-applet.c:850 +#: ../src/ka-applet.c:930 msgid "Network credentials valid" msgstr "Netværksakkreditiver er gyldige" -#: ../src/ka-applet.c:869 +#: ../src/ka-applet.c:949 msgid "Network credentials expiring" msgstr "Netværksakkreditiver udløber" -#: ../src/ka-applet.c:886 +#: ../src/ka-applet.c:966 msgid "Network credentials expired" msgstr "Netværksakkreditiver er udløbet" -#: ../src/ka-applet.c:887 +#: ../src/ka-applet.c:967 msgid "Your Kerberos credentials have expired." msgstr "Dine Kerberosakkreditiver er udløbet." -#: ../src/ka-applet.c:967 -msgid "Remove Credentials _Cache" -msgstr "Fjern akkreditiv_mellemlager" +#: ../src/ka-kerberos.c:176 +msgid "unknown error" +msgstr "ukendt fejl" -#. Ticket dialog -#: ../src/ka-applet.c:978 -msgid "_List Tickets" -msgstr "_Vis billetter" +# er i øjeblikket tomt +#: ../src/ka-kerberos.c:329 +msgid "Your ticket cache is currently empty" +msgstr "Dit billetmellemlager er aktuelt tomt" -#: ../src/ka-tools.c:45 -#, c-format -msgid "" -"There was an error displaying help:\n" -"%s" -msgstr "" -"Der opstod en fejl under visning af hjælp:\n" -"%s" +#: ../src/ka-kerberos.c:360 +msgid "Expired" +msgstr "Udløbet" -#. Translators: add the translators of your language here -#: ../src/ka-tools.c:85 -msgid "translator-credits" -msgstr "" -"Joe Hansen, 2011, 2013.\n" -"\n" -"Dansk-gruppen \n" -"Mere info: http://www.dansk-gruppen.dk" +#: ../src/ka-kerberos.c:1049 +msgid " (No network connection)" +msgstr " (Ingen netværksforbindelse)" -#: ../src/ka-main-window.c:75 +#: ../src/ka-main-window.c:77 msgid "Principal" msgstr "Hoved" -#: ../src/ka-main-window.c:81 +#: ../src/ka-main-window.c:83 msgid "Start Time" msgstr "Starttidspunkt" -#: ../src/ka-main-window.c:87 +#: ../src/ka-main-window.c:89 msgid "End Time" msgstr "Sluttidspunkt" #. Translators: this is an abbreviation for forwardable -#: ../src/ka-main-window.c:94 +#: ../src/ka-main-window.c:96 msgid "Fwd" msgstr "Videresend" #. Translators: this is an abbreviation for proxiable -#: ../src/ka-main-window.c:101 +#: ../src/ka-main-window.c:103 msgid "Proxy" msgstr "Proxy" #. Translators: this is an abbreviation for renewable -#: ../src/ka-main-window.c:108 +#: ../src/ka-main-window.c:110 msgid "Renew" msgstr "Forny" -#: ../src/ka-main-window.c:137 +#: ../src/ka-main-window.c:140 msgid "Error displaying service ticket information" msgstr "Der opstod en fejl ved visning af tjenestebilletinformationen" -#: ../src/ka-preferences.c:297 +#: ../src/ka-preferences.c:369 msgid "Choose Certificate" msgstr "Vælg certifikat" -#: ../src/ka-preferences.c:313 +#: ../src/ka-preferences.c:373 +msgid "_Open" +msgstr "_Åbn" + +#: ../src/ka-preferences.c:385 msgid "X509 Certificates" msgstr "X509-certifikater" -#: ../src/ka-preferences.c:317 +#: ../src/ka-preferences.c:389 msgid "all files" msgstr "alle filer" +#: ../src/ka-pwdialog.c:149 +#, c-format +msgid "%s Error" +msgstr "%s-fejl" + +#: ../src/ka-pwdialog.c:309 +#, c-format +msgid "Couldn't acquire Kerberos ticket: '%s'" +msgstr "Kunne ikke indhente Kerberosbillet: '%s'" + +#: ../src/ka-pwdialog.c:376 +msgid "Please enter your Kerberos password:" +msgstr "Indtast venligst din adgangskode til Kerberos:" + +#: ../src/ka-pwdialog.c:389 +#, c-format +msgid "Please enter the password for '%s':" +msgstr "Indtast venligst adgangskoden for '%s':" + +#: ../src/ka-pwdialog.c:407 +msgid "The password you entered is invalid" +msgstr "Adgangskoden du indtastede er ugyldig" + +#: ../src/ka-tools.c:44 +#, c-format +msgid "" +"There was an error displaying help:\n" +"%s" +msgstr "" +"Der opstod en fejl under visning af hjælp:\n" +"%s" + +#. Translators: add the translators of your language here +#: ../src/ka-tools.c:84 +msgid "translator-credits" +msgstr "" +"Joe Hansen, 2011, 2013, 2016.\n" +"\n" +"Dansk-gruppen \n" +"Mere info: http://www.dansk-gruppen.dk" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +msgid "Kerberos Authentication Dialog" +msgstr "Godkendelsesdialog for Kerberos" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +msgid "Request, renew and view Kerberos tickets" +msgstr "Vis, forny eller anmod om Kerberosbilletter" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:3 +msgid "" +"Kerberos Authentication allows you to list your current Kerberos tickets, " +"and to request a new ticket (authenticate to the Kerberos Server). It also " +"notifies you when your Kerberos credentials are about to expire and renews " +"your ticket automatically if possible." +msgstr "" +"Kerberos Authentication giver dig mulighed for at vise dine nuværende " +"Kerberosbilletter og at anmode om en ny billet (godkende på Kerberosserveren). " +"Programmet påminder dig også, når dine Kerberosakkreditiver er ved at udløbe " +"og fornyer din billet automatisk om muligt." + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:4 +msgid "" +"This is useful if you need to authenticate to a Kerberos Server (KDC) after " +"your login to the desktop (e.g. on a mobile device)." +msgstr "" +"Dette er nyttigt, hvis du har brug for at godkende på en Kerberos Server (KDC) " +"efter dit logind til skrivebordet (f.eks. på en mobil enhed)." + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:5 +msgid "Kerberos authentication dialog" +msgstr "Godkendelsesdialog til Kerberos" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" -msgstr "Godkendelsesdialog for Kerberosnetværk" +msgstr "Godkendelsesdialog til Kerberosnetværk" + +#: ../src/krb5-auth-dialog.desktop.in.h:3 +msgid "kerberos;authentication;" +msgstr "kerberos;godkendelse;autentifikation" #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:1 msgid "Kerberos principal" diff --git a/po/de.po b/po/de.po index 3e4fdf4..f5529aa 100644 --- a/po/de.po +++ b/po/de.po @@ -19,16 +19,16 @@ 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: 2015-06-10 16:57+0000\n" -"PO-Revision-Date: 2016-01-04 19:59+0100\n" -"Last-Translator: Mario Blättermann \n" +"POT-Creation-Date: 2016-10-04 19:47+0000\n" +"PO-Revision-Date: 2016-11-04 21:13+0100\n" +"Last-Translator: Christian Kirbach \n" "Language-Team: Deutsch \n" "Language: de\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: Poedit 1.8.6\n" +"X-Generator: Poedit 1.8.9\n" #: ../src/resources/ui/app-menu.ui.h:1 msgid "Prefere_nces" @@ -122,12 +122,12 @@ msgstr "Smartcard verwenden" #: ../src/resources/ui/ka-preferences.ui.h:15 msgid "If checked, use a security token (Smartcard) to authenticate." msgstr "" -"Legt fest, ob ein Sicherheits-Token (Smartcard) zur Identifizierung " -"verwendet wird" +"Legt fest, ob ein Sicherheits-Token (Smartcard) zur Beglaubigung verwendet " +"wird" #: ../src/resources/ui/ka-preferences.ui.h:16 msgid "Certificate and private key used for authentication" -msgstr "Zertifikat und geheimer Schlüssel zur Identifizierung" +msgstr "Zur Beglaubigung eingesetztes Zertifikat und geheimer Schlüssel" #: ../src/resources/ui/ka-preferences.ui.h:17 msgid "_Browse..." @@ -147,7 +147,7 @@ msgid "" "authentication." msgstr "" "Konfigurieren Sie die Nutzung von Zertifikaten und Smartcards für Ihre " -"Kerberos-Netzwerklegitimierung." +"Kerberos-Netzwerkbeglaubigung" #: ../src/resources/ui/ka-preferences.ui.h:21 msgid "PKINIT" @@ -157,7 +157,7 @@ msgstr "PKINIT" msgid "Notifications" msgstr "Benachrichtigungen" -#. Used in combination: 'Warn x minutes before expiry' +#. Used in combination: #: ../src/resources/ui/ka-preferences.ui.h:24 msgid "Warn" msgstr "Warnen" @@ -170,7 +170,7 @@ msgstr "" "So viele Minuten vor endgültigem Ablauf des Tickets eine Benachrichtigung " "senden" -#. Used in combination: 'Warn x minutes before expiry' +#. Used in combination: #: ../src/resources/ui/ka-preferences.ui.h:27 msgid "minutes before ticket expiry" msgstr "Minuten vor Ablauf des Tickets" @@ -178,7 +178,7 @@ msgstr "Minuten vor Ablauf des Tickets" #: ../src/resources/ui/ka-pwdialog.ui.h:1 #: ../src/krb5-auth-dialog.desktop.in.h:1 msgid "Kerberos Authentication" -msgstr "Kerberos-Legitimierung" +msgstr "Kerberos-Beglaubigung" #: ../src/resources/ui/ka-pwdialog.ui.h:2 ../src/ka-preferences.c:372 msgid "_Cancel" @@ -382,12 +382,12 @@ msgstr "Passwort ist abgelaufen" #. krb5_err.et:krb5:KRB5KDC_ERR_KEY_EXP #: ../src/dummy-strings.c:47 msgid "Preauthentication failed" -msgstr "Vorlegitimierung ist gescheitert" +msgstr "Vorbeglaubigung ist gescheitert" #. krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_FAILED #: ../src/dummy-strings.c:48 msgid "Additional pre-authentication required" -msgstr "Zusätzliche Vorlegitimierung ist erforderlich" +msgstr "Zusätzliche Vorbeglaubigung ist erforderlich" #. krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_REQUIRED #: ../src/dummy-strings.c:49 @@ -428,7 +428,7 @@ msgstr "Das Ticket ist nicht für uns" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOT_US #: ../src/dummy-strings.c:56 msgid "Ticket/authenticator don't match" -msgstr "Ticket und Authentifizierer passen nicht zusammen" +msgstr "Ticket und Beglaubigter passen nicht zusammen" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADMATCH #: ../src/dummy-strings.c:57 @@ -479,7 +479,7 @@ msgstr "Dienstschlüssel ist nicht verfügbar" #. krb5_err.et:krb5:KRB5_NO_LOCALNAME #: ../src/dummy-strings.c:66 ../src/dummy-strings.c:122 msgid "Mutual authentication failed" -msgstr "Gegenseitige Authentifizierung ist gescheitert" +msgstr "Gegenseitige Beglaubigung ist gescheitert" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_MUT_FAIL #: ../src/dummy-strings.c:67 @@ -489,7 +489,7 @@ msgstr "Falsche Richtung der Nachricht" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADDIRECTION #: ../src/dummy-strings.c:68 msgid "Alternative authentication method required" -msgstr "Alternative Authentifizierungsmethode erforderlich" +msgstr "Alternative Beglaubigungsmethode erforderlich" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_METHOD #: ../src/dummy-strings.c:69 @@ -1020,23 +1020,22 @@ msgstr "Ungültige Antwort (während des sendauth-Austausches)" #: ../src/dummy-strings.c:171 msgid "Server rejected authentication (during sendauth exchange)" msgstr "" -"Authentifizierung wurde vom Server abgelehnt (während des sendauth-" -"Austausches)" +"Beglaubigung wurde vom Server abgelehnt (während des sendauth-Austausches)" #. krb5_err.et:krb5:KRB5_SENDAUTH_REJECTED #: ../src/dummy-strings.c:172 msgid "Unsupported preauthentication type" -msgstr "Nicht unterstützter Typ der Vorlegitimierung" +msgstr "Nicht unterstützter Typ der Vorbeglaubigung" #. krb5_err.et:krb5:KRB5_PREAUTH_BAD_TYPE #: ../src/dummy-strings.c:173 msgid "Required preauthentication key not supplied" -msgstr "Benötigter Schlüssel zur Vorlegitimierung wurde nicht übergeben" +msgstr "Benötigter Schlüssel zur Vorbeglaubigung wurde nicht übergeben" #. krb5_err.et:krb5:KRB5_PREAUTH_NO_KEY #: ../src/dummy-strings.c:174 msgid "Generic preauthentication failure" -msgstr "Allgemeiner Fehler bei der Vorlegitimierung" +msgstr "Allgemeiner Fehler bei der Vorbeglaubigung" #. krb5_err.et:krb5:KRB5_PREAUTH_FAILED #: ../src/dummy-strings.c:175 @@ -1696,30 +1695,46 @@ msgstr "" "Christian Kirbach " #: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +msgid "Kerberos Authentication Dialog" +msgstr "Kerberos Beglaubigungsdialog" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +msgid "Request, renew and view Kerberos tickets" +msgstr "Kerberos-Tickets anfordern, erneuern und anschauen" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:3 msgid "" "Kerberos Authentication allows you to list your current Kerberos tickets, " "and to request a new ticket (authenticate to the Kerberos Server). It also " "notifies you when your Kerberos credentials are about to expire and renews " "your ticket automatically if possible." msgstr "" -"Die Kerberos-Legitimierung ermöglicht Ihnen die Anzeige Ihrer aktuellen " -"Kerberos-Tickets und die Anforderung eines neuen Tickets (Legitimierung am " +"Die Kerberos-Beglaubigung ermöglicht Ihnen die Anzeige Ihrer aktuellen " +"Kerberos-Tickets und die Anforderung eines neuen Tickets (Beglaubigung am " "Kerberos-Server). Außerdem werden Sie benachrichtigt, wenn Ihre Kerberos-" "Anmeldedaten bald ablaufen. Ihr Ticket wird automatisch erneuert, wenn " "möglich." -#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#: ../src/krb5-auth-dialog.appdata.xml.in.h:4 msgid "" "This is useful if you need to authenticate to a Kerberos Server (KDC) after " "your login to the desktop (e.g. on a mobile device)." msgstr "" "Dies ist sinnvoll, wenn Sie sich nach der Anmeldung in Ihrer Arbeitsumgebung " -"an einem Kerberos-Server (KDC) anmelden müssen, zum Beispiel auf einem " -"Mobilgerät." +"gegenüber einem Kerberos-Server (KDC) identifizieren müssen, zum Beispiel " +"auf einem Mobilgerät." + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:5 +msgid "Kerberos authentication dialog" +msgstr "Kerberos Beglaubigungsdialog" #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" -msgstr "Kerberos Netzwerkanmeldungsdialog" +msgstr "Kerberos Netzwerk-Beglaubigungsdialog" + +#: ../src/krb5-auth-dialog.desktop.in.h:3 +msgid "kerberos;authentication;" +msgstr "Kerberos;Beglaubigung;Authentifizierung;" #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:1 msgid "Kerberos principal" @@ -1827,4 +1842,3 @@ msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "" "Warnung: q-agent mit Admistratorrechten auszuführen ist auf diesem System " "gefährlich\n" - diff --git a/po/es.po b/po/es.po index d65faa5..54f6732 100644 --- a/po/es.po +++ b/po/es.po @@ -1,21 +1,20 @@ -# translation of krb5-auth-dialog.master.po to Español -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Jorge González , 2009, 2010. -# -# Daniel Mustieles , 2009, 2011, 2012, 2013, 2014, 2015. , 2016. +# translation of krb5-auth-dialog.master.po to Español +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Jorge González , 2009, 2010. +# Daniel Mustieles , 2009, 2011, 2012, 2013, 2014, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" "auth-dialog&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-04-24 15:00+0000\n" -"PO-Revision-Date: 2016-04-28 13:27+0200\n" +"POT-Creation-Date: 2016-10-04 19:47+0000\n" +"PO-Revision-Date: 2016-12-22 12:56+0100\n" "Last-Translator: Daniel Mustieles \n" -"Language-Team: Español; Castellano \n" -"Language: \n" +"Language-Team: es \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -1665,6 +1664,16 @@ msgstr "" "Daniel Mustieles , 2009" #: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +#| msgid "Kerberos Network Authentication Dialog" +msgid "Kerberos Authentication Dialog" +msgstr "Diálogo de autenticación de Kerberos" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#| msgid "Requested Kerberos tickets should be:" +msgid "Request, renew and view Kerberos tickets" +msgstr "Solicitar, renovar y ver tiques de Kerberos" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:3 msgid "" "Kerberos Authentication allows you to list your current Kerberos tickets, " "and to request a new ticket (authenticate to the Kerberos Server). It also " @@ -1676,7 +1685,7 @@ msgstr "" "le informa cuando sus credenciales de Kerberos están a punto de expirar y " "renueva su tique automáticamente si es posible." -#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#: ../src/krb5-auth-dialog.appdata.xml.in.h:4 msgid "" "This is useful if you need to authenticate to a Kerberos Server (KDC) after " "your login to the desktop (e.g. on a mobile device)." @@ -1684,12 +1693,16 @@ msgstr "" "Esto es útil si necesita autenticarse en un servidor Kerberos (KDC) después " "de iniciar sesión en el escritorio (ej. en un dispositivo móvil)." +#: ../src/krb5-auth-dialog.appdata.xml.in.h:5 +#| msgid "Kerberos Authentication" +msgid "Kerberos authentication dialog" +msgstr "Diálogo de autenticación de Kerberos" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Diálogo de autenticación de red de Kerberos" #: ../src/krb5-auth-dialog.desktop.in.h:3 -#| msgid "Kerberos;Authentication" msgid "kerberos;authentication;" msgstr "kerberos;autenticación;" diff --git a/po/fr.po b/po/fr.po index 6f28c9b..0a6a9de 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,9 +1,9 @@ # French translation of krb5-auth-dialog. -# Copyright (C) 2009-2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2016 Free Software Foundation, Inc. # This file is distributed under the same license as the krb5-auth-dialog package. # # Laurent Coudeur , 2009 -# Claude Paroz , 2009-2011 +# Claude Paroz , 2009-2016 # Bruno Brouard , 2011 # msgid "" @@ -11,124 +11,128 @@ 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: 2012-05-28 12:58+0000\n" -"PO-Revision-Date: 2011-10-01 23:20+0200\n" +"POT-Creation-Date: 2016-07-23 20:44+0000\n" +"PO-Revision-Date: 2016-09-05 19:03+0200\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8 bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. -#. * vim:ts:sts=4:sw=4:et: -#. -#: ../src/krb5-auth-dialog.ui.h:1 ../src/krb5-auth-dialog.desktop.in.h:1 -msgid "Kerberos Authentication" -msgstr "Authentification de Kerberos" +#: ../src/resources/ui/app-menu.ui.h:1 +msgid "Prefere_nces" +msgstr "Préfére_nces" -#: ../src/krb5-auth-dialog.ui.h:2 -msgid "_Renew Ticket" -msgstr "_Renouveler le ticket" +#: ../src/resources/ui/app-menu.ui.h:2 +msgid "_About" +msgstr "À _propos" -#: ../src/krb5-auth-dialog.ui.h:3 -msgid "Service Tickets" -msgstr "Tickets de service" +#: ../src/resources/ui/app-menu.ui.h:3 +#: ../src/resources/ui/tray-icon-menu.ui.h:3 +msgid "_Help" +msgstr "Aid_e" -#: ../src/krb5-auth-dialog.ui.h:4 -msgid "_File" -msgstr "_Fichier" +#: ../src/resources/ui/app-menu.ui.h:4 +#: ../src/resources/ui/tray-icon-menu.ui.h:4 +msgid "_Quit" +msgstr "_Quitter" -#: ../src/krb5-auth-dialog.ui.h:5 -msgid "_Edit" -msgstr "É_dition" +#: ../src/resources/ui/tray-icon-menu.ui.h:1 +msgid "Remove Credentials _Cache" +msgstr "Supprimer le _cache des informations d'authentification" -#: ../src/krb5-auth-dialog.ui.h:6 -msgid "_Help" -msgstr "Aid_e" +#: ../src/resources/ui/tray-icon-menu.ui.h:2 +msgid "_List Tickets" +msgstr "É_numérer les tickets" + +#: ../src/resources/ui/ka-main-window.ui.h:1 +msgid "Service Tickets" +msgstr "Tickets de service" -#: ../src/krb5-auth-dialog.ui.h:7 +#: ../src/resources/ui/ka-preferences.ui.h:1 msgid "Kerberos User" msgstr "Utilisateur Kerberos" -#: ../src/krb5-auth-dialog.ui.h:8 +#: ../src/resources/ui/ka-preferences.ui.h:2 msgid "" "The name of your Kerberos account. Leave blank to use your current username." msgstr "" "Le nom de votre compte Kerberos. Laissez vide pour utiliser votre nom " "d'utilisateur actuel." -#: ../src/krb5-auth-dialog.ui.h:9 +#: ../src/resources/ui/ka-preferences.ui.h:3 msgid "Kerberos principal:" msgstr "Principal Kerberos :" -#: ../src/krb5-auth-dialog.ui.h:10 +#: ../src/resources/ui/ka-preferences.ui.h:4 msgid "Kerberos Ticket Options" msgstr "Options des tickets Kerberos" -#: ../src/krb5-auth-dialog.ui.h:11 +#: ../src/resources/ui/ka-preferences.ui.h:5 msgid "Requested Kerberos tickets should be:" msgstr "Les tickets Kerberos demandés doivent être :" -#: ../src/krb5-auth-dialog.ui.h:12 +#: ../src/resources/ui/ka-preferences.ui.h:6 msgid "forwardable" msgstr "transférables" -#: ../src/krb5-auth-dialog.ui.h:13 +#: ../src/resources/ui/ka-preferences.ui.h:7 msgid "If checked, request forwardable tickets" msgstr "Si coché, demande des tickets transférables" -#: ../src/krb5-auth-dialog.ui.h:14 +#: ../src/resources/ui/ka-preferences.ui.h:8 msgid "renewable" msgstr "renouvelables" -#: ../src/krb5-auth-dialog.ui.h:15 +#: ../src/resources/ui/ka-preferences.ui.h:9 msgid "If checked, request renewable tickets" msgstr "Si coché, demande des tickets renouvelables" -#: ../src/krb5-auth-dialog.ui.h:16 +#: ../src/resources/ui/ka-preferences.ui.h:10 msgid "proxiable" msgstr "utilisables via proxy" -#: ../src/krb5-auth-dialog.ui.h:17 +#: ../src/resources/ui/ka-preferences.ui.h:11 msgid "If checked, request proxiable tickets" msgstr "Si coché, demande des tickets utilisables via proxy" -#: ../src/krb5-auth-dialog.ui.h:18 +#: ../src/resources/ui/ka-preferences.ui.h:12 msgid "Kerberos" msgstr "Kerberos" -#: ../src/krb5-auth-dialog.ui.h:19 +#: ../src/resources/ui/ka-preferences.ui.h:13 msgid "Userid" msgstr "Identifiant" -#: ../src/krb5-auth-dialog.ui.h:20 +#: ../src/resources/ui/ka-preferences.ui.h:14 msgid "Use Smartcard" msgstr "Utiliser une carte à puce" -#: ../src/krb5-auth-dialog.ui.h:21 +#: ../src/resources/ui/ka-preferences.ui.h:15 msgid "If checked, use a security token (Smartcard) to authenticate." msgstr "" "Si coché, utilise un jeton de sécurité (carte à puce) pour " "l'authentification." -#: ../src/krb5-auth-dialog.ui.h:22 +#: ../src/resources/ui/ka-preferences.ui.h:16 msgid "Certificate and private key used for authentication" msgstr "Certificat et clé privée utilisés pour l'authentification" -#: ../src/krb5-auth-dialog.ui.h:23 +#: ../src/resources/ui/ka-preferences.ui.h:17 msgid "_Browse..." msgstr "_Parcourir..." -#: ../src/krb5-auth-dialog.ui.h:24 +#: ../src/resources/ui/ka-preferences.ui.h:18 msgid "X509 trust anchors" msgstr "Ancrages de confiance X509" -#: ../src/krb5-auth-dialog.ui.h:25 +#: ../src/resources/ui/ka-preferences.ui.h:19 msgid "Certificate used to verify digital signatures." msgstr "Certificat utilisé pour vérifier les signatures numériques." -#: ../src/krb5-auth-dialog.ui.h:26 +#: ../src/resources/ui/ka-preferences.ui.h:20 msgid "" "Configure the use of certificates and smartcards for your Kerberos network " "authentication." @@ -136,20 +140,20 @@ msgstr "" "Configure l'utilisation de certificats et de cartes à puce pour " "l'authentification sur des réseaux Kerberos." -#: ../src/krb5-auth-dialog.ui.h:27 +#: ../src/resources/ui/ka-preferences.ui.h:21 msgid "PKINIT" msgstr "PKINIT" -#: ../src/krb5-auth-dialog.ui.h:28 +#: ../src/resources/ui/ka-preferences.ui.h:22 msgid "Notifications" msgstr "Notifications" -#. Used in combination: 'Warn x minutes before expiry' -#: ../src/krb5-auth-dialog.ui.h:30 +#. Used in combination: +#: ../src/resources/ui/ka-preferences.ui.h:24 msgid "Warn" msgstr "Avertir" -#: ../src/krb5-auth-dialog.ui.h:31 +#: ../src/resources/ui/ka-preferences.ui.h:25 msgid "" "Send notification about ticket expiry that many minutes before it finally " "expires" @@ -157,56 +161,23 @@ msgstr "" "Envoyer une notification à propos de l'expiration d'un ticket tant de " "minutes avant qu'il n'expire" -#. Used in combination: 'Warn x minutes before expiry' -#: ../src/krb5-auth-dialog.ui.h:33 +#. Used in combination: +#: ../src/resources/ui/ka-preferences.ui.h:27 msgid "minutes before ticket expiry" msgstr "minutes avant l'expiration du ticket" -#: ../src/ka-kerberos.c:177 -msgid "unknown error" -msgstr "erreur inconnue" - -#: ../src/ka-kerberos.c:317 -msgid "Your ticket cache is currently empty" -msgstr "Votre cache de tickets est actuellement vide" - -#: ../src/ka-kerberos.c:341 -msgid "Expired" -msgstr "Expiré" - -#: ../src/ka-pwdialog.c:178 -#, c-format -msgid "Couldn't acquire kerberos ticket: '%s'" -msgstr "Impossible d'acquérir le ticket Kerberos : « %s »" - -#: ../src/ka-pwdialog.c:217 ../src/ka-applet.c:466 -#, c-format -msgid "Your credentials expire in %d minute" -msgid_plural "Your credentials expire in %d minutes" -msgstr[0] "Vos informations d'authentification vont expirer dans %d minute" -msgstr[1] "Vos informations d'authentification vont expirer dans %d minutes" - -#: ../src/ka-pwdialog.c:222 ../src/ka-applet.c:471 -msgid "Your credentials have expired" -msgstr "Vos informations d'authentification ont expiré." - -#: ../src/ka-pwdialog.c:245 -msgid "Please enter your Kerberos password:" -msgstr "Veuillez saisir votre mot de passe Kerberos :" - -#: ../src/ka-pwdialog.c:258 -#, c-format -msgid "Please enter the password for '%s':" -msgstr "Veuillez saisir le mot de passe pour « %s » :" +#: ../src/resources/ui/ka-pwdialog.ui.h:1 +#: ../src/krb5-auth-dialog.desktop.in.h:1 +msgid "Kerberos Authentication" +msgstr "Authentification de Kerberos" -#: ../src/ka-pwdialog.c:276 -msgid "The password you entered is invalid" -msgstr "Le mot de passe que vous avez saisi n'est pas valide" +#: ../src/resources/ui/ka-pwdialog.ui.h:2 ../src/ka-preferences.c:372 +msgid "_Cancel" +msgstr "A_nnuler" -#: ../src/ka-pwdialog.c:292 -#, c-format -msgid "%s Error" -msgstr "Erreur %s" +#: ../src/resources/ui/ka-pwdialog.ui.h:3 +msgid "_Renew Ticket" +msgstr "_Renouveler le ticket" #. Translators: files from dummy-strings.c are *all* possible errors #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in @@ -1535,213 +1506,291 @@ msgstr "Numéro magique GSSAPI OID incorrect" msgid "Bad magic number for GSSAPI QUEUE" msgstr "Numéro magique GSSAPI QUEUE incorrect" -#: ../src/ka-applet.c:460 +#: ../src/ka-applet.c:654 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Vos informations d'authentification expirent dans %.2d h %.2d" -#: ../src/ka-applet.c:642 +#: ../src/ka-applet.c:660 ../src/ka-pwdialog.c:348 +#, c-format +msgid "Your credentials expire in %d minute" +msgid_plural "Your credentials expire in %d minutes" +msgstr[0] "Vos informations d'authentification vont expirer dans %d minute" +msgstr[1] "Vos informations d'authentification vont expirer dans %d minutes" + +#: ../src/ka-applet.c:665 ../src/ka-pwdialog.c:353 +msgid "Your credentials have expired" +msgstr "Vos informations d'authentification ont expiré." + +#: ../src/ka-applet.c:837 msgid "List Tickets" msgstr "Énumérer les tickets" -#: ../src/ka-applet.c:652 +#: ../src/ka-applet.c:847 msgid "Get Ticket" msgstr "Obtenir le ticket" -#: ../src/ka-applet.c:661 +#: ../src/ka-applet.c:856 msgid "Don't show me this again" msgstr "Ne plus afficher" -#: ../src/ka-applet.c:668 +#: ../src/ka-applet.c:863 msgid "Remove Credentials Cache" msgstr "Supprimer le cache des informations d'authentification" -#: ../src/ka-applet.c:717 +#: ../src/ka-applet.c:925 msgid "You have valid Kerberos credentials." msgstr "Vos informations d'authentification Kerberos sont valides." -#: ../src/ka-applet.c:719 +#: ../src/ka-applet.c:927 msgid "You've refreshed your Kerberos credentials." msgstr "Vous avez actualisé vos informations d'authentification Kerberos." -#: ../src/ka-applet.c:722 +#: ../src/ka-applet.c:930 msgid "Network credentials valid" msgstr "Informations d'authentification réseau valides" -#: ../src/ka-applet.c:741 +#: ../src/ka-applet.c:949 msgid "Network credentials expiring" msgstr "Informations d'authentification Kerberos en cours d'expiration" -#: ../src/ka-applet.c:759 +#: ../src/ka-applet.c:966 msgid "Network credentials expired" msgstr "Informations d'authentification réseau expirées" -#: ../src/ka-applet.c:760 +#: ../src/ka-applet.c:967 msgid "Your Kerberos credentials have expired." msgstr "Vos informations d'authentification Kerberos ont expiré." -#: ../src/ka-applet.c:839 -msgid "Remove Credentials _Cache" -msgstr "Supprimer le _cache des informations d'authentification" +#: ../src/ka-kerberos.c:176 +msgid "unknown error" +msgstr "erreur inconnue" -#. Ticket dialog -#: ../src/ka-applet.c:849 -msgid "_List Tickets" -msgstr "É_numérer les tickets" +#: ../src/ka-kerberos.c:329 +msgid "Your ticket cache is currently empty" +msgstr "Votre cache de tickets est actuellement vide" -#: ../src/ka-tools.c:45 -#, c-format -msgid "" -"There was an error displaying help:\n" -"%s" -msgstr "" -"Une erreur est survenue lors de l'affichage de l'aide :\n" -"%s" +#: ../src/ka-kerberos.c:360 +msgid "Expired" +msgstr "Expiré" -#. Translators: add the translators of your language here -#: ../src/ka-tools.c:83 -msgid "translator-credits" -msgstr "" -"Laurent Coudeur \n" -"Claude Paroz " +#: ../src/ka-kerberos.c:1049 +msgid " (No network connection)" +msgstr " (aucune connexion réseau)" -#: ../src/ka-main-window.c:119 +#: ../src/ka-main-window.c:77 msgid "Principal" msgstr "Principal" -#: ../src/ka-main-window.c:125 +#: ../src/ka-main-window.c:83 msgid "Start Time" msgstr "Heure de début" -#: ../src/ka-main-window.c:131 +#: ../src/ka-main-window.c:89 msgid "End Time" msgstr "Heure de fin" #. Translators: this is an abbreviation for forwardable -#: ../src/ka-main-window.c:138 +#: ../src/ka-main-window.c:96 msgid "Fwd" msgstr "Transfert" #. Translators: this is an abbreviation for proxiable -#: ../src/ka-main-window.c:145 +#: ../src/ka-main-window.c:103 msgid "Proxy" msgstr "Proxy" #. Translators: this is an abbreviation for renewable -#: ../src/ka-main-window.c:152 +#: ../src/ka-main-window.c:110 msgid "Renew" msgstr "Renouvellement" -#: ../src/ka-main-window.c:179 +#: ../src/ka-main-window.c:140 msgid "Error displaying service ticket information" msgstr "Erreur lors de l'affichage des informations du ticket de service" -#: ../src/ka-preferences.c:340 +#: ../src/ka-preferences.c:369 msgid "Choose Certificate" msgstr "Choix d'un certificat" -#: ../src/ka-preferences.c:356 +#: ../src/ka-preferences.c:373 +msgid "_Open" +msgstr "_Ouvrir" + +#: ../src/ka-preferences.c:385 msgid "X509 Certificates" msgstr "Certificats X509" -#: ../src/ka-preferences.c:360 +#: ../src/ka-preferences.c:389 msgid "all files" msgstr "tous les fichiers" +#: ../src/ka-pwdialog.c:149 +#, c-format +msgid "%s Error" +msgstr "Erreur %s" + +#: ../src/ka-pwdialog.c:309 +#, c-format +msgid "Couldn't acquire Kerberos ticket: '%s'" +msgstr "Impossible d'acquérir le ticket Kerberos : « %s »" + +#: ../src/ka-pwdialog.c:376 +msgid "Please enter your Kerberos password:" +msgstr "Veuillez saisir votre mot de passe Kerberos :" + +#: ../src/ka-pwdialog.c:389 +#, c-format +msgid "Please enter the password for '%s':" +msgstr "Veuillez saisir le mot de passe pour « %s » :" + +#: ../src/ka-pwdialog.c:407 +msgid "The password you entered is invalid" +msgstr "Le mot de passe que vous avez saisi n'est pas valide" + +#: ../src/ka-tools.c:44 +#, c-format +msgid "" +"There was an error displaying help:\n" +"%s" +msgstr "" +"Une erreur est survenue lors de l'affichage de l'aide :\n" +"%s" + +#. Translators: add the translators of your language here +#: ../src/ka-tools.c:84 +msgid "translator-credits" +msgstr "" +"Laurent Coudeur \n" +"Claude Paroz " + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +msgid "" +"Kerberos Authentication allows you to list your current Kerberos tickets, " +"and to request a new ticket (authenticate to the Kerberos Server). It also " +"notifies you when your Kerberos credentials are about to expire and renews " +"your ticket automatically if possible." +msgstr "" +"L'authentification Kerberos permet d'afficher la liste des tickets Kerberos " +"en cours, et de demander un nouveau ticket (authentification sur le serveur " +"Kerberos). Il signale également lorsqu'une autorisation Kerberos est sur le " +"point d'expirer et renouvelle automatiquement le ticket si possible." + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +msgid "" +"This is useful if you need to authenticate to a Kerberos Server (KDC) after " +"your login to the desktop (e.g. on a mobile device)." +msgstr "" +"C'est utile quand vous avez besoin de vous authentifier auprès d'un serveur " +"Kerberos (KDC) après vous être connecté à un bureau (par ex. sur un appareil " +"mobile)." + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Boîte de dialogue d'authentification réseau Kerberos" -#: ../src/krb5-auth-dialog.schemas.in.h:1 +#: ../src/krb5-auth-dialog.desktop.in.h:3 +msgid "kerberos;authentication;" +msgstr "kerberos;authentification;" + +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:1 msgid "Kerberos principal" msgstr "Principal Kerberos" -#: ../src/krb5-auth-dialog.schemas.in.h:2 -msgid "The kerberos principal to acquire the ticket for" +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:2 +msgid "The Kerberos principal to acquire the ticket for" msgstr "Le principal Kerberos pour lequel obtenir le ticket" -#: ../src/krb5-auth-dialog.schemas.in.h:3 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:3 msgid "PKINIT identifier" msgstr "Identifiant PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:4 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:4 msgid "The principal's public/private/certificate identifier when using PKINIT" msgstr "" "L'identifiant publique/privé/certificat du principal lors de l'utilisation " "de PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:5 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:5 msgid "PKINIT trust anchors" msgstr "Ancrages de confiance PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:6 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:6 msgid "PKINIT CA certificates" msgstr "Certificats CA PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:7 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:7 msgid "Prompt minutes before expiry" msgstr "Avertir n minutes avant l'expiration" -#: ../src/krb5-auth-dialog.schemas.in.h:8 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:8 msgid "" "Start prompting/displaying notifications that many minutes before expiry" msgstr "" "Commencer à demander/afficher des notifications tant de minutes avant " "l'expiration" -#: ../src/krb5-auth-dialog.schemas.in.h:9 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:9 msgid "Forwardable ticket" msgstr "Ticket transférable" -#: ../src/krb5-auth-dialog.schemas.in.h:10 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:10 msgid "Requested tickets should be forwardable" msgstr "Les tickets demandés doivent être transférables" -#: ../src/krb5-auth-dialog.schemas.in.h:11 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:11 msgid "Renewable ticket" msgstr "Ticket renouvelable" -#: ../src/krb5-auth-dialog.schemas.in.h:12 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:12 msgid "Requested tickets should be renewable" msgstr "Les tickets demandés doivent être renouvelables" -#: ../src/krb5-auth-dialog.schemas.in.h:13 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:13 msgid "Proxiable ticket" msgstr "Ticket utilisable via proxy" -#: ../src/krb5-auth-dialog.schemas.in.h:14 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:14 msgid "Requested tickets should be proxiable" msgstr "Les tickets demandés doivent être utilisables au travers d'un proxy" -#: ../src/krb5-auth-dialog.schemas.in.h:15 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:15 +msgid "Configuration tickets" +msgstr "Tickets de configuration" + +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:16 +msgid "Show configuration tickets" +msgstr "Affiche les tickets de configuration" + +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:17 msgid "valid ticket notification" msgstr "Notification de ticket valide" -#: ../src/krb5-auth-dialog.schemas.in.h:16 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:18 msgid "Notify user when ticket becomes valid" msgstr "Avertir l'utilisateur lorsque le ticket devient valide" -#: ../src/krb5-auth-dialog.schemas.in.h:17 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:19 msgid "ticket expiring notification" msgstr "Notification de ticket en cours d'expiration" -#: ../src/krb5-auth-dialog.schemas.in.h:18 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:20 msgid "Notify user when ticket is about to expire" msgstr "Avertir l'utilisateur lorsque le ticket est sur le point d'expirer" -#: ../src/krb5-auth-dialog.schemas.in.h:19 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:21 msgid "ticket expired notification" msgstr "Notification de ticket expiré" -#: ../src/krb5-auth-dialog.schemas.in.h:20 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:22 msgid "Notify user when ticket has expired" msgstr "Avertir l'utilisateur lorsque le ticket a expiré" -#: ../src/krb5-auth-dialog.schemas.in.h:21 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:23 msgid "Enabled plugins" msgstr "Greffons actifs" -#: ../src/krb5-auth-dialog.schemas.in.h:22 +#: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:24 msgid "List of plugins that should be loaded and activated on startup." msgstr "Liste de greffons qui sont chargés et activés au démarrage." @@ -1749,3 +1798,9 @@ msgstr "Liste de greffons qui sont chargés et activés au démarrage." #, c-format msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "Avertissement : exécuter q-agent setuid sur ce système est dangereux\n" + +#~ msgid "_File" +#~ msgstr "_Fichier" + +#~ msgid "_Edit" +#~ msgstr "É_dition" diff --git a/po/hu.po b/po/hu.po index b368fcf..11e353b 100644 --- a/po/hu.po +++ b/po/hu.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: 2016-04-29 00:31+0000\n" -"PO-Revision-Date: 2016-04-30 14:49+0200\n" +"POT-Creation-Date: 2016-10-04 19:47+0000\n" +"PO-Revision-Date: 2016-10-19 05:24+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -1648,6 +1648,16 @@ msgstr "" "Úr Balázs , 2016." #: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +#| msgid "Kerberos authentication dialog" +msgid "Kerberos Authentication Dialog" +msgstr "Kerberos hitelesítési ablak" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#| msgid "Requested Kerberos tickets should be:" +msgid "Request, renew and view Kerberos tickets" +msgstr "Kerberos jegyek kérése, megújítása és megjelenítése" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:3 msgid "" "Kerberos Authentication allows you to list your current Kerberos tickets, " "and to request a new ticket (authenticate to the Kerberos Server). It also " @@ -1659,7 +1669,7 @@ msgstr "" "Emellett értesíti is Önt, ha a jegyei hamarosan lejárnak, és automatikusan " "meg is újítja azokat, ha lehetséges." -#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#: ../src/krb5-auth-dialog.appdata.xml.in.h:4 msgid "" "This is useful if you need to authenticate to a Kerberos Server (KDC) after " "your login to the desktop (e.g. on a mobile device)." @@ -1667,9 +1677,13 @@ msgstr "" "Ez hasznos, ha hitelesítenie kell egy Kerberos kiszolgáló (KDC) felé, miután " "bejelentkezett a fiókjába (például egy mobil eszközön)." +#: ../src/krb5-auth-dialog.appdata.xml.in.h:5 +msgid "Kerberos authentication dialog" +msgstr "Kerberos hitelesítési ablak" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" -msgstr "Kerberos hálózati hitelesítés párbeszédablak" +msgstr "Kerberos hálózati hitelesítés ablak" #: ../src/krb5-auth-dialog.desktop.in.h:3 msgid "kerberos;authentication;" diff --git a/po/nb.po b/po/nb.po index 38e86a7..63a3ace 100644 --- a/po/nb.po +++ b/po/nb.po @@ -13,7 +13,7 @@ msgstr "" "PO-Revision-Date: 2011-03-28 20:39+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian Bokmål \n" -"Language: \n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pa.po b/po/pa.po index 999c283..df98899 100644 --- a/po/pa.po +++ b/po/pa.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2009-06-08 07:00+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" +"Language: pa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pl.po b/po/pl.po index 0822a2a..19a3a48 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,27 +1,23 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for krb5-auth-dialog. +# Copyright © 2015-2016 the krb5-auth-dialog authors. +# This file is distributed under the same license as the krb5-auth-dialog package. # Piotr Drąg , 2015-2016. -# Aviary.pl , 2015-2016. +# Aviary.pl , 2015-2016. +# msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-25 19:47+0200\n" -"PO-Revision-Date: 2016-04-25 19:48+0200\n" +"POT-Creation-Date: 2016-10-09 08:34+0200\n" +"PO-Revision-Date: 2016-10-09 08:35+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #: ../src/resources/ui/app-menu.ui.h:1 msgid "Prefere_nces" @@ -29,7 +25,7 @@ msgstr "Prefere_ncje" #: ../src/resources/ui/app-menu.ui.h:2 msgid "_About" -msgstr "_O programie" +msgstr "_O programie" #: ../src/resources/ui/app-menu.ui.h:3 #: ../src/resources/ui/tray-icon-menu.ui.h:3 @@ -118,7 +114,7 @@ msgstr "Używa tokena zabezpieczeń (kartę smartcard) do uwierzytelniania." #: ../src/resources/ui/ka-preferences.ui.h:16 msgid "Certificate and private key used for authentication" -msgstr "Certyfikat i klucz prywatny używane do uwierzytelniania" +msgstr "Certyfikat i klucz prywatny używane do uwierzytelniania" #: ../src/resources/ui/ka-preferences.ui.h:17 msgid "_Browse..." @@ -137,7 +133,7 @@ msgid "" "Configure the use of certificates and smartcards for your Kerberos network " "authentication." msgstr "" -"Konfiguruje użycie certyfikatów i kart smartcard do uwierzytelniania w sieci " +"Konfiguruje użycie certyfikatów i kart smartcard do uwierzytelniania w sieci " "Kerberos." #: ../src/resources/ui/ka-preferences.ui.h:21 @@ -158,7 +154,7 @@ msgid "" "Send notification about ticket expiry that many minutes before it finally " "expires" msgstr "" -"Wysyła powiadomienie o wygaśnięciu biletu na podaną liczbę minut przed jego " +"Wysyła powiadomienie o wygaśnięciu biletu na podaną liczbę minut przed jego " "ostatecznym wygaśnięciem" #. Used in combination: @@ -190,7 +186,7 @@ msgstr "Wywołanie ASN.1 do systemowej biblioteki czasu się nie powiodło" #. asn1_err.et:asn1:ASN1_BAD_TIMEFORMAT #: ../src/dummy-strings.c:11 msgid "ASN.1 structure is missing a required field" -msgstr "W strukturze ASN.1 brakuje wymaganego pola" +msgstr "W strukturze ASN.1 brakuje wymaganego pola" #. asn1_err.et:asn1:ASN1_MISSING_FIELD #: ../src/dummy-strings.c:12 @@ -235,7 +231,7 @@ msgstr "Błąd przetwarzania ASN.1" #. asn1_err.et:asn1:ASN1_PARSE_ERROR #: ../src/dummy-strings.c:20 msgid "ASN.1 bad return from gmtime" -msgstr "Błędny zwrot ASN.1 z gmtime" +msgstr "Błędny zwrot ASN.1 z gmtime" #. asn1_err.et:asn1:ASN1_BAD_GMTIME #: ../src/dummy-strings.c:21 @@ -245,7 +241,7 @@ msgstr "Nieskonstruowane nieskończone kodowanie ASN.1" #. asn1_err.et:asn1:ASN1_MISMATCH_INDEF #: ../src/dummy-strings.c:22 msgid "ASN.1 missing expected EOC" -msgstr "Brak oczekiwanego EOC w ASN.1" +msgstr "Brak oczekiwanego EOC w ASN.1" #. asn1_err.et:asn1:ASN1_MISSING_EOC #: ../src/dummy-strings.c:23 @@ -255,12 +251,12 @@ msgstr "Brak błędu" #. krb5_err.et:krb5:KRB5KDC_ERR_NONE #: ../src/dummy-strings.c:24 msgid "Client's entry in database has expired" -msgstr "Wpis klienta w bazie danych wygasł" +msgstr "Wpis klienta w bazie danych wygasł" #. krb5_err.et:krb5:KRB5KDC_ERR_NAME_EXP #: ../src/dummy-strings.c:25 msgid "Server's entry in database has expired" -msgstr "Wpis serwera w bazie danych wygasł" +msgstr "Wpis serwera w bazie danych wygasł" #. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_EXP #: ../src/dummy-strings.c:26 @@ -270,32 +266,32 @@ msgstr "Zażądano nieobsługiwanej wersji protokołu" #. krb5_err.et:krb5:KRB5KDC_ERR_BAD_PVNO #: ../src/dummy-strings.c:27 msgid "Client's key is encrypted in an old master key" -msgstr "Klucz klienta jest zaszyfrowany w poprzednim głównym kluczu" +msgstr "Klucz klienta jest zaszyfrowany w poprzednim głównym kluczu" #. krb5_err.et:krb5:KRB5KDC_ERR_C_OLD_MAST_KVNO #: ../src/dummy-strings.c:28 msgid "Server's key is encrypted in an old master key" -msgstr "Klucz serwera jest zaszyfrowany w poprzednim głównym kluczu" +msgstr "Klucz serwera jest zaszyfrowany w poprzednim głównym kluczu" #. krb5_err.et:krb5:KRB5KDC_ERR_S_OLD_MAST_KVNO #: ../src/dummy-strings.c:29 msgid "Client not found in Kerberos database" -msgstr "Nie odnaleziono klienta w bazie danych Kerberos" +msgstr "Nie odnaleziono klienta w bazie danych Kerberos" #. krb5_err.et:krb5:KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN #: ../src/dummy-strings.c:30 msgid "Server not found in Kerberos database" -msgstr "Nie odnaleziono serwera w bazie danych Kerberos" +msgstr "Nie odnaleziono serwera w bazie danych Kerberos" #. krb5_err.et:krb5:KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN #: ../src/dummy-strings.c:31 msgid "Principal has multiple entries in Kerberos database" -msgstr "Naczelnik posiada wiele wpisów w bazie danych Kerberos" +msgstr "Naczelnik ma wiele wpisów w bazie danych Kerberos" #. krb5_err.et:krb5:KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE #: ../src/dummy-strings.c:32 msgid "Client or server has a null key" -msgstr "Klient lub serwer posiada pusty klucz" +msgstr "Klient lub serwer ma pusty klucz" #. krb5_err.et:krb5:KRB5KDC_ERR_NULL_KEY #: ../src/dummy-strings.c:33 @@ -380,7 +376,7 @@ msgstr "Wymagane jest dodatkowe uprzednie uwierzytelnienie" #. krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_REQUIRED #: ../src/dummy-strings.c:49 msgid "Requested server and ticket don't match" -msgstr "Żądany serwer i bilet się nie zgadzają" +msgstr "Żądany serwer i bilet się nie zgadzają" #. krb5_err.et:krb5:KRB5KDC_ERR_SERVER_NOMATCH #: ../src/dummy-strings.c:50 @@ -445,7 +441,7 @@ msgstr "Zmodyfikowano potok komunikatów" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_MODIFIED #: ../src/dummy-strings.c:62 msgid "Message out of order" -msgstr "Komunikaty nie są w kolejności" +msgstr "Komunikaty nie są w kolejności" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADORDER #: ../src/dummy-strings.c:63 @@ -481,12 +477,12 @@ msgstr "Wymagana jest alternatywna metoda uwierzytelniania" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_METHOD #: ../src/dummy-strings.c:69 msgid "Incorrect sequence number in message" -msgstr "Niepoprawny numer sekwencji w komunikacie" +msgstr "Niepoprawny numer sekwencji w komunikacie" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADSEQ #: ../src/dummy-strings.c:70 msgid "Inappropriate type of checksum in message" -msgstr "Nieodpowiedni typ sumy kontrolnej w komunikacie" +msgstr "Nieodpowiedni typ sumy kontrolnej w komunikacie" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_INAPP_CKSUM #: ../src/dummy-strings.c:71 @@ -576,7 +572,7 @@ msgstr "Niespójny cel klucza" #. krb5_err.et:krb5:KRB5KDC_ERR_INCONSISTENT_KEY_PURPOSE #: ../src/dummy-strings.c:88 msgid "Digest in certificate not accepted" -msgstr "Nie przyjęto „digest” w certyfikacie" +msgstr "Nie przyjęto „digest” w certyfikacie" #. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED #: ../src/dummy-strings.c:89 @@ -586,7 +582,7 @@ msgstr "Należy dołączyć sumę kontrolną" #. krb5_err.et:krb5:KRB5KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED #: ../src/dummy-strings.c:90 msgid "Digest in signed-data not accepted" -msgstr "Nie przyjęto „digest” w „signed-data”" +msgstr "Nie przyjęto „digest” w „signed-data”" #. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED #: ../src/dummy-strings.c:91 @@ -621,7 +617,7 @@ msgstr "Przerwano odczyt hasła" #. krb5_err.et:krb5:KRB5_LIBOS_PWDINTR #: ../src/dummy-strings.c:97 msgid "Illegal character in component name" -msgstr "Niedozwolony znak w nazwie składnika" +msgstr "Niedozwolony znak w nazwie składnika" #. krb5_err.et:krb5:KRB5_PARSE_ILLCHAR #: ../src/dummy-strings.c:98 @@ -676,7 +672,7 @@ msgstr "Żądanie nie dostarczyło biletu" #. krb5_err.et:krb5:KRB5_NO_TKT_SUPPLIED #: ../src/dummy-strings.c:108 msgid "Wrong principal in request" -msgstr "Błędny naczelnik w żądaniu" +msgstr "Błędny naczelnik w żądaniu" #. krb5_err.et:krb5:KRB5KRB_AP_WRONG_PRINC #: ../src/dummy-strings.c:109 @@ -686,7 +682,7 @@ msgstr "Bilet ma ustawioną nieprawidłową flagę" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_INVALID #: ../src/dummy-strings.c:110 msgid "Requested principal and ticket don't match" -msgstr "Żądany naczelnik i bilet się nie zgadzają" +msgstr "Żądany naczelnik i bilet się nie zgadzają" #. krb5_err.et:krb5:KRB5_PRINC_NOMATCH #: ../src/dummy-strings.c:111 @@ -696,12 +692,12 @@ msgstr "Odpowiedź KDC nie pasuje do oczekiwań" #. krb5_err.et:krb5:KRB5_KDCREP_MODIFIED #: ../src/dummy-strings.c:112 msgid "Clock skew too great in KDC reply" -msgstr "Odchylenie zegara w odpowiedzi KDC jest za duże" +msgstr "Odchylenie zegara w odpowiedzi KDC jest za duże" #. krb5_err.et:krb5:KRB5_KDCREP_SKEW #: ../src/dummy-strings.c:113 msgid "Client/server realm mismatch in initial ticket request" -msgstr "Obszar klienta/serwera w początkowym żądaniu biletu się nie zgadza" +msgstr "Obszar klienta/serwera w początkowym żądaniu biletu się nie zgadza" #. krb5_err.et:krb5:KRB5_IN_TKT_REALM_MISMATCH #: ../src/dummy-strings.c:114 @@ -716,7 +712,7 @@ msgstr "Program nie obsługuje typu klucza" #. krb5_err.et:krb5:KRB5_PROG_KEYTYPE_NOSUPP #: ../src/dummy-strings.c:116 msgid "Requested encryption type not used in message" -msgstr "Żądany typ szyfrowania nie jest użyty w komunikacie" +msgstr "Żądany typ szyfrowania nie jest użyty w komunikacie" #. krb5_err.et:krb5:KRB5_WRONG_ETYPE #: ../src/dummy-strings.c:117 @@ -736,7 +732,7 @@ msgstr "Nieznana usługa Kerberos" #. krb5_err.et:krb5:KRB5_SERVICE_UNKNOWN #: ../src/dummy-strings.c:120 msgid "Cannot contact any KDC for requested realm" -msgstr "Nie można skontaktować się z żadnym KDC dla żądanego obszaru" +msgstr "Nie można skontaktować się z żadnym KDC dla żądanego obszaru" #. krb5_err.et:krb5:KRB5_KDC_UNREACH #: ../src/dummy-strings.c:121 @@ -751,7 +747,7 @@ msgstr "Typ bufora powtórki jest już zarejestrowany" #. krb5_err.et:krb5:KRB5_RC_TYPE_EXISTS #: ../src/dummy-strings.c:124 msgid "No more memory to allocate (in replay cache code)" -msgstr "Brak pamięci do przydzielenia (w kodzie bufora powtórki)" +msgstr "Brak pamięci do przydzielenia (w kodzie bufora powtórki)" #. krb5_err.et:krb5:KRB5_RC_MALLOC #: ../src/dummy-strings.c:125 @@ -786,23 +782,23 @@ msgstr "Błąd przetwarzania/formatu nazwy bufora powtórki" #. krb5_err.et:krb5:KRB5_RC_PARSE #: ../src/dummy-strings.c:131 msgid "End-of-file on replay cache I/O" -msgstr "Koniec pliku w wejściu/wyjściu bufora powtórki" +msgstr "Koniec pliku w wejściu/wyjściu bufora powtórki" #. krb5_err.et:krb5:KRB5_RC_IO_EOF #: ../src/dummy-strings.c:132 msgid "No more memory to allocate (in replay cache I/O code)" msgstr "" -"Brak pamięci do przydzielenia (w kodzie wejścia/wyjścia bufora powtórki)" +"Brak pamięci do przydzielenia (w kodzie wejścia/wyjścia bufora powtórki)" #. krb5_err.et:krb5:KRB5_RC_IO_MALLOC #: ../src/dummy-strings.c:133 msgid "Permission denied in replay cache code" -msgstr "Odmowa uprawnień w kodzie bufora powtórki" +msgstr "Odmowa uprawnień w kodzie bufora powtórki" #. krb5_err.et:krb5:KRB5_RC_IO_PERM #: ../src/dummy-strings.c:134 msgid "I/O error in replay cache i/o code" -msgstr "Błąd wejścia/wyjścia w kodzie wejścia/wyjścia bufora powtórki" +msgstr "Błąd wejścia/wyjścia w kodzie wejścia/wyjścia bufora powtórki" #. krb5_err.et:krb5:KRB5_RC_IO_IO #: ../src/dummy-strings.c:135 @@ -812,7 +808,7 @@ msgstr "Ogólny, nieznany błąd RC lub wejścia/wyjścia" #. krb5_err.et:krb5:KRB5_RC_IO_UNKNOWN #: ../src/dummy-strings.c:136 msgid "Insufficient system space to store replay information" -msgstr "Brak miejsca w systemie do przechowania informacji o powtórce" +msgstr "Brak miejsca w systemie do przechowania informacji o powtórce" #. krb5_err.et:krb5:KRB5_RC_IO_SPACE #: ../src/dummy-strings.c:137 @@ -882,7 +878,7 @@ msgstr "Nie można odnaleźć biletu dla żądanego obszaru" #. krb5_err.et:krb5:KRB5_NO_TKT_IN_RLM #: ../src/dummy-strings.c:150 msgid "DES key has bad parity" -msgstr "Klucz DES posiada błędną parzystość" +msgstr "Klucz DES ma błędną parzystość" #. krb5_err.et:krb5:KRB5DES_BAD_KEYPAR #: ../src/dummy-strings.c:151 @@ -897,12 +893,12 @@ msgstr "Błędny typ szyfrowania" #. krb5_err.et:krb5:KRB5_BAD_ENCTYPE #: ../src/dummy-strings.c:153 msgid "Key size is incompatible with encryption type" -msgstr "Rozmiar klucza jest niezgodny z typem szyfrowania" +msgstr "Rozmiar klucza jest niezgodny z typem szyfrowania" #. krb5_err.et:krb5:KRB5_BAD_KEYSIZE #: ../src/dummy-strings.c:154 msgid "Message size is incompatible with encryption type" -msgstr "Rozmiar komunikatu jest niezgodny z typem szyfrowania" +msgstr "Rozmiar komunikatu jest niezgodny z typem szyfrowania" #. krb5_err.et:krb5:KRB5_BAD_MSIZE #: ../src/dummy-strings.c:155 @@ -945,18 +941,18 @@ msgstr "Błąd podczas zapisywania do bufora danych uwierzytelniających" #: ../src/dummy-strings.c:162 msgid "No more memory to allocate (in credentials cache code)" msgstr "" -"Brak pamięci do przydzielenia (w kodzie bufora danych uwierzytelniających)" +"Brak pamięci do przydzielenia (w kodzie bufora danych uwierzytelniających)" #. krb5_err.et:krb5:KRB5_CC_NOMEM #: ../src/dummy-strings.c:163 msgid "Bad format in credentials cache" -msgstr "Błędny format w buforze danych uwierzytelniających" +msgstr "Błędny format w buforze danych uwierzytelniających" #. krb5_err.et:krb5:KRB5_CC_FORMAT #: ../src/dummy-strings.c:164 msgid "No credentials found with supported encryption types" msgstr "" -"Nie odnaleziono danych uwierzytelniających z obsługiwanymi typami szyfrowania" +"Nie odnaleziono danych uwierzytelniających z obsługiwanymi typami szyfrowania" #. krb5_err.et:krb5:KRB5_CC_NOT_KTYPE #: ../src/dummy-strings.c:165 @@ -966,7 +962,7 @@ msgstr "Nieprawidłowe połączenie opcji KDC (wewnętrzny błąd biblioteki)" #. krb5_err.et:krb5:KRB5_INVALID_FLAGS #: ../src/dummy-strings.c:166 msgid "Request missing second ticket" -msgstr "Brak drugiego biletu w żądaniu" +msgstr "Brak drugiego biletu w żądaniu" #. krb5_err.et:krb5:KRB5_NO_2ND_TKT #: ../src/dummy-strings.c:167 @@ -1056,7 +1052,7 @@ msgstr "Błąd: odpowiedź początkowego biletu wygląda na wersję 4" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_V4_REPLY #: ../src/dummy-strings.c:184 msgid "Cannot resolve network address for KDC in requested realm" -msgstr "Nie można rozwiązać adresu sieciowego dla KDC w żądanym obszarze" +msgstr "Nie można rozwiązać adresu sieciowego dla KDC w żądanym obszarze" #. krb5_err.et:krb5:KRB5_REALM_CANT_RESOLVE #: ../src/dummy-strings.c:185 @@ -1072,7 +1068,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_FWD_BAD_PRINCIPAL #: ../src/dummy-strings.c:187 msgid "Looping detected inside krb5_get_in_tkt" -msgstr "Wykryto pętlę w „krb5_get_in_tkt”" +msgstr "Wykryto pętlę w „krb5_get_in_tkt”" #. krb5_err.et:krb5:KRB5_GET_IN_TKT_LOOP #: ../src/dummy-strings.c:188 @@ -1082,22 +1078,22 @@ msgstr "Plik konfiguracji nie określa domyślnego obszaru" #. krb5_err.et:krb5:KRB5_CONFIG_NODEFREALM #: ../src/dummy-strings.c:189 msgid "Bad SAM flags in obtain_sam_padata" -msgstr "Błędne flagi SAM w „obtain_sam_padata”" +msgstr "Błędne flagi SAM w „obtain_sam_padata”" #. krb5_err.et:krb5:KRB5_SAM_UNSUPPORTED #: ../src/dummy-strings.c:190 msgid "Invalid encryption type in SAM challenge" -msgstr "Nieprawidłowy typ szyfrowania w wyzwaniu SAM" +msgstr "Nieprawidłowy typ szyfrowania w wyzwaniu SAM" #. krb5_err.et:krb5:KRB5_SAM_INVALID_ETYPE #: ../src/dummy-strings.c:191 msgid "Missing checksum in SAM challenge" -msgstr "Brak sumy kontrolnej w wyzwaniu SAM" +msgstr "Brak sumy kontrolnej w wyzwaniu SAM" #. krb5_err.et:krb5:KRB5_SAM_NO_CHECKSUM #: ../src/dummy-strings.c:192 msgid "Bad checksum in SAM challenge" -msgstr "Błędna suma kontrolna w wyzwaniu SAM" +msgstr "Błędna suma kontrolna w wyzwaniu SAM" #. krb5_err.et:krb5:KRB5_SAM_BAD_CHECKSUM #: ../src/dummy-strings.c:193 @@ -1107,7 +1103,7 @@ msgstr "Nazwa tablicy kluczy jest za długa" #. krb5_err.et:krb5:KRB5_KT_NAME_TOOLONG #: ../src/dummy-strings.c:194 msgid "Key version number for principal in key table is incorrect" -msgstr "Niepoprawny numer wersji klucza dla naczelnika w tablicy kluczy" +msgstr "Niepoprawny numer wersji klucza dla naczelnika w tablicy kluczy" #. krb5_err.et:krb5:KRB5_KT_KVNONOTFOUND #: ../src/dummy-strings.c:195 @@ -1132,7 +1128,7 @@ msgstr "Zmiana hasła się nie powiodła" #. krb5_err.et:krb5:KRB5_CHPW_FAIL #: ../src/dummy-strings.c:199 msgid "Bad format in keytab" -msgstr "Błędny format w tablicy kluczy" +msgstr "Błędny format w tablicy kluczy" #. krb5_err.et:krb5:KRB5_KT_FORMAT #: ../src/dummy-strings.c:200 @@ -1177,7 +1173,7 @@ msgstr "Nie można ustalić obszaru dla numerycznego adresu komputera" #. krb5_err.et:krb5:KRB5_ERR_NUMERIC_REALM #: ../src/dummy-strings.c:208 msgid "Invalid key generation parameters from KDC" -msgstr "Nieprawidłowe parametry tworzenia klucza z KDC" +msgstr "Nieprawidłowe parametry tworzenia klucza z KDC" #. krb5_err.et:krb5:KRB5_ERR_BAD_S2K_PARAMS #: ../src/dummy-strings.c:209 @@ -1592,7 +1588,7 @@ msgstr "Odnaw." #: ../src/ka-main-window.c:140 msgid "Error displaying service ticket information" -msgstr "Błąd podczas wyświetlania informacji o bilecie usługi" +msgstr "Błąd podczas wyświetlania informacji o bilecie usługi" #: ../src/ka-preferences.c:369 msgid "Choose Certificate" @@ -1647,9 +1643,17 @@ msgstr "" msgid "translator-credits" msgstr "" "Piotr Drąg , 2015-2016\n" -"Aviary.pl , 2015-2016" +"Aviary.pl , 2015-2016" #: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +msgid "Kerberos Authentication Dialog" +msgstr "Uwierzytelnianie w sieci Kerberos" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +msgid "Request, renew and view Kerberos tickets" +msgstr "Żądanie, odnawianie i wyświetlanie biletów sieci Kerberos" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:3 msgid "" "Kerberos Authentication allows you to list your current Kerberos tickets, " "and to request a new ticket (authenticate to the Kerberos Server). It also " @@ -1657,21 +1661,25 @@ msgid "" "your ticket automatically if possible." msgstr "" "Uwierzytelnianie Kerberos umożliwia wyświetlanie listy obecnych biletów " -"Kerberos oraz żądanie nowych (uwierzytelniając w serwerze Kerberos). " -"Powiadamia także o wygaśnięciu danych uwierzytelniających Kerberos i " -"automatycznie odnawia bilet." +"Kerberos oraz żądanie nowych (uwierzytelniając w serwerze Kerberos). " +"Powiadamia także o wygaśnięciu danych uwierzytelniających Kerberos " +"i automatycznie odnawia bilet." -#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#: ../src/krb5-auth-dialog.appdata.xml.in.h:4 msgid "" "This is useful if you need to authenticate to a Kerberos Server (KDC) after " "your login to the desktop (e.g. on a mobile device)." msgstr "" -"Jest to przydatne do uwierzytelniania w serwerze Kerberos (KDC) po " +"Jest to przydatne do uwierzytelniania w serwerze Kerberos (KDC) po " "zalogowaniu na komputerze (np. na telefonie komórkowym)." +#: ../src/krb5-auth-dialog.appdata.xml.in.h:5 +msgid "Kerberos authentication dialog" +msgstr "Okno uwierzytelniania w sieci Kerberos" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" -msgstr "Okno dialogowe uwierzytelnienia w sieci Kerberos" +msgstr "Okno uwierzytelniania w sieci Kerberos" #: ../src/krb5-auth-dialog.desktop.in.h:3 msgid "kerberos;authentication;" @@ -1748,7 +1756,7 @@ msgstr "Wyświetlanie biletów konfiguracji" #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:17 msgid "valid ticket notification" -msgstr "Powiadomienie o ważnym bilecie" +msgstr "Powiadomienie o ważnym bilecie" #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:18 msgid "Notify user when ticket becomes valid" @@ -1756,7 +1764,7 @@ msgstr "Powiadamianie użytkownika, kiedy bilet staje się ważny" #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:19 msgid "ticket expiring notification" -msgstr "Powiadomienie o wygasającym bilecie" +msgstr "Powiadomienie o wygasającym bilecie" #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:20 msgid "Notify user when ticket is about to expire" @@ -1764,7 +1772,7 @@ msgstr "Powiadamianie użytkownika, kiedy bilet ma niedługo wygasnąć" #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:21 msgid "ticket expired notification" -msgstr "Powiadomienie o wygaśnięciu biletu" +msgstr "Powiadomienie o wygaśnięciu biletu" #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:22 msgid "Notify user when ticket has expired" @@ -1776,11 +1784,11 @@ msgstr "Włączone wtyczki" #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:24 msgid "List of plugins that should be loaded and activated on startup." -msgstr "Lista wtyczek wczytywanych i włączanych podczas uruchamiania." +msgstr "Lista wtyczek wczytywanych i włączanych podczas uruchamiania." #: ../secmem/util.c:106 #, c-format msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "" -"Ostrzeżenie: uruchomienie q-agent za pomocą setuid w tym systemie jest " +"Ostrzeżenie: uruchomienie q-agent za pomocą setuid w tym systemie jest " "niebezpieczne\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 428aabd..451de75 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,17 +1,16 @@ # Brazilian Portuguese translation for krb5-auth-dialog. -# Copyright (C) 2013 krb5-auth-dialog's COPYRIGHT HOLDER +# Copyright (C) 2016 krb5-auth-dialog's COPYRIGHT HOLDER # This file is distributed under the same license as the krb5-auth-dialog package. # Djavan Fagundes , 2010. -# Djavan Fagundes , 2010. # Enrico Nicoletto , 2013. # Rafael Fontenelle , 2016. msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5" -"-auth-dialog&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-04-24 15:00+0000\n" -"PO-Revision-Date: 2016-04-25 12:55-0200\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: 2016-10-04 19:47+0000\n" +"PO-Revision-Date: 2016-12-28 17:02-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -19,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Virtaal 1.0.0-beta1\n" "X-Project-Style: gnome\n" #: ../src/resources/ui/app-menu.ui.h:1 @@ -122,7 +121,7 @@ msgstr "Certificado e chave privada usada para autenticação" #: ../src/resources/ui/ka-preferences.ui.h:17 msgid "_Browse..." -msgstr "_Navegar..." +msgstr "_Navegar…" #: ../src/resources/ui/ka-preferences.ui.h:18 msgid "X509 trust anchors" @@ -235,7 +234,7 @@ msgstr "ASN.1 erro de análise" #. asn1_err.et:asn1:ASN1_PARSE_ERROR #: ../src/dummy-strings.c:20 msgid "ASN.1 bad return from gmtime" -msgstr "ASN.1 resposta ruim da gmtime" +msgstr "ASN.1 resposta inválida da gmtime" #. asn1_err.et:asn1:ASN1_BAD_GMTIME #: ../src/dummy-strings.c:21 @@ -884,7 +883,7 @@ msgstr "Não foi possível encontrar tíquete para o domínio solicitado" #. krb5_err.et:krb5:KRB5_NO_TKT_IN_RLM #: ../src/dummy-strings.c:150 msgid "DES key has bad parity" -msgstr "A chave DES possui paridade ruim" +msgstr "A chave DES possui paridade inválida" #. krb5_err.et:krb5:KRB5DES_BAD_KEYPAR #: ../src/dummy-strings.c:151 @@ -894,7 +893,7 @@ msgstr "A chave DES é uma chave fraca" #. krb5_err.et:krb5:KRB5DES_WEAK_KEY #: ../src/dummy-strings.c:152 msgid "Bad encryption type" -msgstr "Tipo de criptografia ruim" +msgstr "Tipo de criptografia inválida" #. krb5_err.et:krb5:KRB5_BAD_ENCTYPE #: ../src/dummy-strings.c:153 @@ -949,7 +948,7 @@ msgstr "Sem mais memória para alocar (em código de cache de credenciais)" #. krb5_err.et:krb5:KRB5_CC_NOMEM #: ../src/dummy-strings.c:163 msgid "Bad format in credentials cache" -msgstr "Formato ruim no cache de credenciais" +msgstr "Formato inválida no cache de credenciais" #. krb5_err.et:krb5:KRB5_CC_FORMAT #: ../src/dummy-strings.c:164 @@ -974,7 +973,7 @@ msgstr "Sem credenciais fornecidas para biblioteca de rotina" #. krb5_err.et:krb5:KRB5_NOCREDS_SUPPLIED #: ../src/dummy-strings.c:168 msgid "Bad sendauth version was sent" -msgstr "Uma versão sendauth errada foi enviada" +msgstr "Uma versão de sendauth errada foi enviada" #. krb5_err.et:krb5:KRB5_SENDAUTH_BADAUTHVERS #: ../src/dummy-strings.c:169 @@ -1060,12 +1059,12 @@ msgstr "" #. krb5_err.et:krb5:KRB5_REALM_CANT_RESOLVE #: ../src/dummy-strings.c:185 msgid "Requesting ticket can't get forwardable tickets" -msgstr "Ao requisitar tíquete não é possível obter tickets encaminhados" +msgstr "Ao requisitar tíquete não é possível obter tíquetes encaminhados" #. krb5_err.et:krb5:KRB5_TKT_NOT_FORWARDABLE #: ../src/dummy-strings.c:186 msgid "Bad principal name while trying to forward credentials" -msgstr "Nome principal ruim ao tentar encaminhar credenciais" +msgstr "Nome principal inválida ao tentar encaminhar credenciais" #. krb5_err.et:krb5:KRB5_FWD_BAD_PRINCIPAL #: ../src/dummy-strings.c:187 @@ -1090,12 +1089,12 @@ msgstr "Tipo de criptografia inválida no desafio SAM" #. krb5_err.et:krb5:KRB5_SAM_INVALID_ETYPE #: ../src/dummy-strings.c:191 msgid "Missing checksum in SAM challenge" -msgstr "Faltando checksum no desafio SAM" +msgstr "Faltando soma de verificação no desafio SAM" #. krb5_err.et:krb5:KRB5_SAM_NO_CHECKSUM #: ../src/dummy-strings.c:192 msgid "Bad checksum in SAM challenge" -msgstr "Checksum ruim no desafio SAM" +msgstr "Soma de verificação inválida no desafio SAM" #. krb5_err.et:krb5:KRB5_SAM_BAD_CHECKSUM #: ../src/dummy-strings.c:193 @@ -1152,7 +1151,7 @@ msgstr "O programa chamado é obsoleto, função apagada" #. krb5_err.et:krb5:KRB5_OBSOLETE_FN #: ../src/dummy-strings.c:203 msgid "unknown getaddrinfo failure" -msgstr "falha getaddrinfo desconhecida" +msgstr "falha desconhecida de getaddrinfo" #. krb5_err.et:krb5:KRB5_EAI_FAIL #: ../src/dummy-strings.c:204 @@ -1219,278 +1218,278 @@ msgstr "Tabela de número mágico V5 do Kerberos" #. kv5m_err.et:kv5m:KV5M_NONE #: ../src/dummy-strings.c:216 msgid "Bad magic number for krb5_principal structure" -msgstr "Número mágico ruim para estrutura krb5_principal" +msgstr "Número mágico inválida para estrutura krb5_principal" #. kv5m_err.et:kv5m:KV5M_PRINCIPAL #: ../src/dummy-strings.c:217 msgid "Bad magic number for krb5_data structure" -msgstr "Número mágico ruim para estrutura krb5_data" +msgstr "Número mágico inválida para estrutura krb5_data" #. kv5m_err.et:kv5m:KV5M_DATA #: ../src/dummy-strings.c:218 msgid "Bad magic number for krb5_keyblock structure" -msgstr "Número mágico ruim para estrutura krb5_keyblock" +msgstr "Número mágico inválida para estrutura krb5_keyblock" #. kv5m_err.et:kv5m:KV5M_KEYBLOCK #: ../src/dummy-strings.c:219 msgid "Bad magic number for krb5_checksum structure" -msgstr "Número mágico ruim para estrutura krb5_checksum" +msgstr "Número mágico inválida para estrutura krb5_checksum" #. kv5m_err.et:kv5m:KV5M_CHECKSUM #: ../src/dummy-strings.c:220 msgid "Bad magic number for krb5_encrypt_block structure" -msgstr "Número mágico ruim para estrutura krb5_encrypt_block" +msgstr "Número mágico inválida para estrutura krb5_encrypt_block" #. kv5m_err.et:kv5m:KV5M_ENCRYPT_BLOCK #: ../src/dummy-strings.c:221 msgid "Bad magic number for krb5_enc_data structure" -msgstr "Número mágico ruim para estrutura krb5_enc_data" +msgstr "Número mágico inválida para estrutura krb5_enc_data" #. kv5m_err.et:kv5m:KV5M_ENC_DATA #: ../src/dummy-strings.c:222 msgid "Bad magic number for krb5_cryptosystem_entry structure" -msgstr "Número mágico ruim para estrutura krb5_cryptosystem_entry" +msgstr "Número mágico inválida para estrutura krb5_cryptosystem_entry" #. kv5m_err.et:kv5m:KV5M_CRYPTOSYSTEM_ENTRY #: ../src/dummy-strings.c:223 msgid "Bad magic number for krb5_cs_table_entry structure" -msgstr "Número mágico ruim para estrutura krb5_cs_table_entry" +msgstr "Número mágico inválida para estrutura krb5_cs_table_entry" #. kv5m_err.et:kv5m:KV5M_CS_TABLE_ENTRY #: ../src/dummy-strings.c:224 msgid "Bad magic number for krb5_checksum_entry structure" -msgstr "Número mágico ruim para estrutura krb5_checksum_entry" +msgstr "Número mágico inválida para estrutura krb5_checksum_entry" #. kv5m_err.et:kv5m:KV5M_CHECKSUM_ENTRY #: ../src/dummy-strings.c:225 msgid "Bad magic number for krb5_authdata structure" -msgstr "Número mágico ruim para estrutura krb5_authdata" +msgstr "Número mágico inválida para estrutura krb5_authdata" #. kv5m_err.et:kv5m:KV5M_AUTHDATA #: ../src/dummy-strings.c:226 msgid "Bad magic number for krb5_transited structure" -msgstr "Número mágico ruim para estrutura krb5_transited" +msgstr "Número mágico inválida para estrutura krb5_transited" #. kv5m_err.et:kv5m:KV5M_TRANSITED #: ../src/dummy-strings.c:227 msgid "Bad magic number for krb5_enc_tkt_part structure" -msgstr "Número mágico ruim para estrutura krb5_enc_tkt_part" +msgstr "Número mágico inválida para estrutura krb5_enc_tkt_part" #. kv5m_err.et:kv5m:KV5M_ENC_TKT_PART #: ../src/dummy-strings.c:228 msgid "Bad magic number for krb5_ticket structure" -msgstr "Número mágico ruim para estrutura krb5_ticket" +msgstr "Número mágico inválida para estrutura krb5_ticket" #. kv5m_err.et:kv5m:KV5M_TICKET #: ../src/dummy-strings.c:229 msgid "Bad magic number for krb5_authenticator structure" -msgstr "Número mágico ruim para estrutura krb5_authenticator" +msgstr "Número mágico inválida para estrutura krb5_authenticator" #. kv5m_err.et:kv5m:KV5M_AUTHENTICATOR #: ../src/dummy-strings.c:230 msgid "Bad magic number for krb5_tkt_authent structure" -msgstr "Número mágico ruim para estrutura krb5_tkt_authent" +msgstr "Número mágico inválida para estrutura krb5_tkt_authent" #. kv5m_err.et:kv5m:KV5M_TKT_AUTHENT #: ../src/dummy-strings.c:231 msgid "Bad magic number for krb5_creds structure" -msgstr "Número mágico ruim para estrutura krb5_creds" +msgstr "Número mágico inválida para estrutura krb5_creds" #. kv5m_err.et:kv5m:KV5M_CREDS #: ../src/dummy-strings.c:232 msgid "Bad magic number for krb5_last_req_entry structure" -msgstr "Número mágico ruim para estrutura krb5_last_req_entry" +msgstr "Número mágico inválida para estrutura krb5_last_req_entry" #. kv5m_err.et:kv5m:KV5M_LAST_REQ_ENTRY #: ../src/dummy-strings.c:233 msgid "Bad magic number for krb5_pa_data structure" -msgstr "Número mágico ruim para estrutura krb5_pa_data" +msgstr "Número mágico inválida para estrutura krb5_pa_data" #. kv5m_err.et:kv5m:KV5M_PA_DATA #: ../src/dummy-strings.c:234 msgid "Bad magic number for krb5_kdc_req structure" -msgstr "Número mágico ruim para estrutura krb5_kdc_req" +msgstr "Número mágico inválida para estrutura krb5_kdc_req" #. kv5m_err.et:kv5m:KV5M_KDC_REQ #: ../src/dummy-strings.c:235 msgid "Bad magic number for krb5_enc_kdc_rep_part structure" -msgstr "Número mágico ruim para estrutura krb5_enc_kdc_rep_part" +msgstr "Número mágico inválida para estrutura krb5_enc_kdc_rep_part" #. kv5m_err.et:kv5m:KV5M_ENC_KDC_REP_PART #: ../src/dummy-strings.c:236 msgid "Bad magic number for krb5_kdc_rep structure" -msgstr "Número mágico ruim para estrutura krb5_kdc_rep" +msgstr "Número mágico inválida para estrutura krb5_kdc_rep" #. kv5m_err.et:kv5m:KV5M_KDC_REP #: ../src/dummy-strings.c:237 msgid "Bad magic number for krb5_error structure" -msgstr "Número mágico ruim para estrutura krb5_error" +msgstr "Número mágico inválida para estrutura krb5_error" #. kv5m_err.et:kv5m:KV5M_ERROR #: ../src/dummy-strings.c:238 msgid "Bad magic number for krb5_ap_req structure" -msgstr "Número mágico ruim para estrutura krb5_ap_req" +msgstr "Número mágico inválida para estrutura krb5_ap_req" #. kv5m_err.et:kv5m:KV5M_AP_REQ #: ../src/dummy-strings.c:239 msgid "Bad magic number for krb5_ap_rep structure" -msgstr "Número mágico ruim para estrutura krb5_ap_rep" +msgstr "Número mágico inválida para estrutura krb5_ap_rep" #. kv5m_err.et:kv5m:KV5M_AP_REP #: ../src/dummy-strings.c:240 msgid "Bad magic number for krb5_ap_rep_enc_part structure" -msgstr "Número mágico ruim para estrutura krb5_ap_rep_enc_part" +msgstr "Número mágico inválida para estrutura krb5_ap_rep_enc_part" #. kv5m_err.et:kv5m:KV5M_AP_REP_ENC_PART #: ../src/dummy-strings.c:241 msgid "Bad magic number for krb5_response structure" -msgstr "Número mágico ruim para estrutura krb5_response" +msgstr "Número mágico inválida para estrutura krb5_response" #. kv5m_err.et:kv5m:KV5M_RESPONSE #: ../src/dummy-strings.c:242 msgid "Bad magic number for krb5_safe structure" -msgstr "Número mágico ruim para estrutura krb5_safe" +msgstr "Número mágico inválida para estrutura krb5_safe" #. kv5m_err.et:kv5m:KV5M_SAFE #: ../src/dummy-strings.c:243 msgid "Bad magic number for krb5_priv structure" -msgstr "Número mágico ruim para estrutura krb5_priv" +msgstr "Número mágico inválida para estrutura krb5_priv" #. kv5m_err.et:kv5m:KV5M_PRIV #: ../src/dummy-strings.c:244 msgid "Bad magic number for krb5_priv_enc_part structure" -msgstr "Número mágico ruim para estrutura krb5_priv_enc_part" +msgstr "Número mágico inválida para estrutura krb5_priv_enc_part" #. kv5m_err.et:kv5m:KV5M_PRIV_ENC_PART #: ../src/dummy-strings.c:245 msgid "Bad magic number for krb5_cred structure" -msgstr "Número mágico ruim para estrutura krb5_cred" +msgstr "Número mágico inválida para estrutura krb5_cred" #. kv5m_err.et:kv5m:KV5M_CRED #: ../src/dummy-strings.c:246 msgid "Bad magic number for krb5_cred_info structure" -msgstr "Número mágico ruim para estrutura krb5_cred_info" +msgstr "Número mágico inválida para estrutura krb5_cred_info" #. kv5m_err.et:kv5m:KV5M_CRED_INFO #: ../src/dummy-strings.c:247 msgid "Bad magic number for krb5_cred_enc_part structure" -msgstr "Número mágico ruim para estrutura krb5_cred_enc_part" +msgstr "Número mágico inválida para estrutura krb5_cred_enc_part" #. kv5m_err.et:kv5m:KV5M_CRED_ENC_PART #: ../src/dummy-strings.c:248 msgid "Bad magic number for krb5_pwd_data structure" -msgstr "Número mágico ruim para estrutura krb5_pwd_data" +msgstr "Número mágico inválida para estrutura krb5_pwd_data" #. kv5m_err.et:kv5m:KV5M_PWD_DATA #: ../src/dummy-strings.c:249 msgid "Bad magic number for krb5_address structure" -msgstr "Número mágico ruim para estrutura krb5_address" +msgstr "Número mágico inválida para estrutura krb5_address" #. kv5m_err.et:kv5m:KV5M_ADDRESS #: ../src/dummy-strings.c:250 msgid "Bad magic number for krb5_keytab_entry structure" -msgstr "Número mágico ruim para estrutura krb5_keytab_entry" +msgstr "Número mágico inválida para estrutura krb5_keytab_entry" #. kv5m_err.et:kv5m:KV5M_KEYTAB_ENTRY #: ../src/dummy-strings.c:251 msgid "Bad magic number for krb5_context structure" -msgstr "Número mágico ruim para estrutura krb5_context" +msgstr "Número mágico inválida para estrutura krb5_context" #. kv5m_err.et:kv5m:KV5M_CONTEXT #: ../src/dummy-strings.c:252 msgid "Bad magic number for krb5_os_context structure" -msgstr "Número mágico ruim para estrutura krb5_os_context" +msgstr "Número mágico inválida para estrutura krb5_os_context" #. kv5m_err.et:kv5m:KV5M_OS_CONTEXT #: ../src/dummy-strings.c:253 msgid "Bad magic number for krb5_alt_method structure" -msgstr "Número mágico ruim para estrutura krb5_alt_method" +msgstr "Número mágico inválida para estrutura krb5_alt_method" #. kv5m_err.et:kv5m:KV5M_ALT_METHOD #: ../src/dummy-strings.c:254 msgid "Bad magic number for krb5_etype_info_entry structure" -msgstr "Número mágico ruim para estrutura krb5_etype_info_entry" +msgstr "Número mágico inválida para estrutura krb5_etype_info_entry" #. kv5m_err.et:kv5m:KV5M_ETYPE_INFO_ENTRY #: ../src/dummy-strings.c:255 msgid "Bad magic number for krb5_db_context structure" -msgstr "Número mágico ruim para estrutura krb5_db_context" +msgstr "Número mágico inválida para estrutura krb5_db_context" #. kv5m_err.et:kv5m:KV5M_DB_CONTEXT #: ../src/dummy-strings.c:256 msgid "Bad magic number for krb5_auth_context structure" -msgstr "Número mágico ruim para estrutura krb5_auth_context" +msgstr "Número mágico inválida para estrutura krb5_auth_context" #. kv5m_err.et:kv5m:KV5M_AUTH_CONTEXT #: ../src/dummy-strings.c:257 msgid "Bad magic number for krb5_keytab structure" -msgstr "Número mágico ruim para estrutura krb5_keytab" +msgstr "Número mágico inválida para estrutura krb5_keytab" #. kv5m_err.et:kv5m:KV5M_KEYTAB #: ../src/dummy-strings.c:258 msgid "Bad magic number for krb5_rcache structure" -msgstr "Número mágico ruim para estrutura krb5_rcache" +msgstr "Número mágico inválida para estrutura krb5_rcache" #. kv5m_err.et:kv5m:KV5M_RCACHE #: ../src/dummy-strings.c:259 msgid "Bad magic number for krb5_ccache structure" -msgstr "Número mágico ruim para estrutura krb5_ccache" +msgstr "Número mágico inválida para estrutura krb5_ccache" #. kv5m_err.et:kv5m:KV5M_CCACHE #: ../src/dummy-strings.c:260 msgid "Bad magic number for krb5_preauth_ops" -msgstr "Número mágico ruim para krb5_preauth_ops" +msgstr "Número mágico inválida para krb5_preauth_ops" #. kv5m_err.et:kv5m:KV5M_PREAUTH_OPS #: ../src/dummy-strings.c:261 msgid "Bad magic number for krb5_sam_challenge" -msgstr "Número mágico ruim para krb5_sam_challenge" +msgstr "Número mágico inválida para krb5_sam_challenge" #. kv5m_err.et:kv5m:KV5M_SAM_CHALLENGE #: ../src/dummy-strings.c:262 msgid "Bad magic number for krb5_sam_challenge_2" -msgstr "Número mágico ruim para krb5_sam_challenge_2" +msgstr "Número mágico inválida para krb5_sam_challenge_2" #. kv5m_err.et:kv5m:KV5M_SAM_CHALLENGE_2 #: ../src/dummy-strings.c:263 msgid "Bad magic number for krb5_sam_key" -msgstr "Número mágico ruim para krb5_sam_key" +msgstr "Número mágico inválida para krb5_sam_key" #. kv5m_err.et:kv5m:KV5M_SAM_KEY #. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC #: ../src/dummy-strings.c:264 ../src/dummy-strings.c:265 msgid "Bad magic number for krb5_enc_sam_response_enc" -msgstr "Número mágico ruim para krb5_enc_sam_response_enc" +msgstr "Número mágico inválida para krb5_enc_sam_response_enc" #. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC_2 #: ../src/dummy-strings.c:266 msgid "Bad magic number for krb5_sam_response" -msgstr "Número mágico ruim para krb5_sam_response" +msgstr "Número mágico inválida para krb5_sam_response" #. kv5m_err.et:kv5m:KV5M_SAM_RESPONSE #: ../src/dummy-strings.c:267 msgid "Bad magic number for krb5_sam_response 2" -msgstr "Número mágico ruim para krb5_sam_response 2" +msgstr "Número mágico inválida para krb5_sam_response 2" #. kv5m_err.et:kv5m:KV5M_SAM_RESPONSE_2 #: ../src/dummy-strings.c:268 msgid "Bad magic number for krb5_predicted_sam_response" -msgstr "Número mágico ruim para krb5_predicted_sam_response" +msgstr "Número mágico inválida para krb5_predicted_sam_response" #. kv5m_err.et:kv5m:KV5M_PREDICTED_SAM_RESPONSE #: ../src/dummy-strings.c:269 msgid "Bad magic number for passwd_phrase_element" -msgstr "Número mágico ruim para passwd_phrase_element" +msgstr "Número mágico inválida para passwd_phrase_element" #. kv5m_err.et:kv5m:KV5M_PASSWD_PHRASE_ELEMENT #: ../src/dummy-strings.c:270 msgid "Bad magic number for GSSAPI OID" -msgstr "Número mágico ruim para GSSAPI OID" +msgstr "Número mágico inválida para GSSAPI OID" #. kv5m_err.et:kv5m:KV5M_GSS_OID #: ../src/dummy-strings.c:271 msgid "Bad magic number for GSSAPI QUEUE" -msgstr "Número mágico ruim para GSSAPI QUEUE" +msgstr "Número mágico inválida para GSSAPI QUEUE" #: ../src/ka-applet.c:654 #, c-format @@ -1619,7 +1618,7 @@ msgstr "Erro %s" #: ../src/ka-pwdialog.c:309 #, c-format msgid "Couldn't acquire Kerberos ticket: '%s'" -msgstr "Não é possível adquirir tíquete do Kerberos: \"%s\"" +msgstr "Não é possível adquirir tíquete do Kerberos: “%s”" #: ../src/ka-pwdialog.c:376 msgid "Please enter your Kerberos password:" @@ -1628,7 +1627,7 @@ msgstr "Por favor, digite a sua senha do Kerberos:" #: ../src/ka-pwdialog.c:389 #, c-format msgid "Please enter the password for '%s':" -msgstr "Por favor, digite a senha para \"%s\":" +msgstr "Por favor, digite a senha para “%s”:" #: ../src/ka-pwdialog.c:407 msgid "The password you entered is invalid" @@ -1646,9 +1645,20 @@ msgstr "" #. Translators: add the translators of your language here #: ../src/ka-tools.c:84 msgid "translator-credits" -msgstr "Djavan Fagundes " +msgstr "" +"Djavan Fagundes , 2010\n" +"Enrico Nicoletto , 2013\n" +"Rafael Fontenelle , 2016" #: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +msgid "Kerberos Authentication Dialog" +msgstr "Diálogo de autenticação do Kerberos" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +msgid "Request, renew and view Kerberos tickets" +msgstr "Requisite, renove e visualize tíquetes do Kerberos" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:3 msgid "" "Kerberos Authentication allows you to list your current Kerberos tickets, " "and to request a new ticket (authenticate to the Kerberos Server). It also " @@ -1660,20 +1670,24 @@ msgstr "" "Ele também o avisa quando suas credenciais do Kerberos estão prestes a serem " "expiradas e, se possível, renova o seu tíquete automaticamente." -#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#: ../src/krb5-auth-dialog.appdata.xml.in.h:4 msgid "" "This is useful if you need to authenticate to a Kerberos Server (KDC) after " "your login to the desktop (e.g. on a mobile device)." msgstr "" -"Isto é util se você precisa autenticar a um servidor Kerberos (KDC) após ter " +"Isto é útil se você precisa autenticar a um servidor Kerberos (KDC) após ter " "iniciado sessão na área de trabalho (ex.: em um dispositivo móvel)." +#: ../src/krb5-auth-dialog.appdata.xml.in.h:5 +#| msgid "Kerberos Authentication" +msgid "Kerberos authentication dialog" +msgstr "Diálogo de autenticação do Kerberos" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Diálogo de autenticação de rede do Kerberos" #: ../src/krb5-auth-dialog.desktop.in.h:3 -#| msgid "Kerberos Authentication" msgid "kerberos;authentication;" msgstr "kerberos;autenticação;" diff --git a/po/sl.po b/po/sl.po index 2dd31fe..ae57ebb 100644 --- a/po/sl.po +++ b/po/sl.po @@ -12,7 +12,7 @@ msgstr "" "PO-Revision-Date: 2013-03-28 08:48+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" -"Language: \n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/sr.po b/po/sr.po index 7af71e9..8b0f16b 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,16 +1,16 @@ # Serbian translation for krb5-auth-dialog. # Copyright (C) 2013 krb5-auth-dialog's COPYRIGHT HOLDER # This file is distributed under the same license as the krb5-auth-dialog package. -# Мирослав Николић , 2013—2015. +# Мирослав Николић , 2013—2017. msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5" "-auth-dialog&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-06-10 16:57+0000\n" -"PO-Revision-Date: 2015-12-30 12:23+0200\n" +"POT-Creation-Date: 2016-10-04 19:47+0000\n" +"PO-Revision-Date: 2017-02-12 18:14+0200\n" "Last-Translator: Мирослав Николић \n" -"Language-Team: Serbian \n" +"Language-Team: Serbian <(nothing)>\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,7 +146,7 @@ msgstr "ПКИНИТ" msgid "Notifications" msgstr "Обавештења" -#. Used in combination: 'Warn x minutes before expiry' +#. Used in combination: #: ../src/resources/ui/ka-preferences.ui.h:24 msgid "Warn" msgstr "Упозори" @@ -157,7 +157,7 @@ msgid "" "expires" msgstr "Шаље обавештење о истеку купона онолико минута пре коначног истека" -#. Used in combination: 'Warn x minutes before expiry' +#. Used in combination: #: ../src/resources/ui/ka-preferences.ui.h:27 msgid "minutes before ticket expiry" msgstr "минута пре истека купона" @@ -1609,7 +1609,6 @@ msgstr "%s грешка" #: ../src/ka-pwdialog.c:309 #, c-format -#| msgid "Couldn't acquire kerberos ticket: '%s'" msgid "Couldn't acquire Kerberos ticket: '%s'" msgstr "Не могу да набавим купон Кербероса: „%s“" @@ -1644,6 +1643,16 @@ msgstr "" " http://prevod.org — превод на српски језик" #: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +#| msgid "Kerberos Network Authentication Dialog" +msgid "Kerberos Authentication Dialog" +msgstr "Прозорче потврђивања идентитета Кербероса" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#| msgid "Requested Kerberos tickets should be:" +msgid "Request, renew and view Kerberos tickets" +msgstr "Захтевајте, обновите и прегледајте купоне Кербероса" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:3 msgid "" "Kerberos Authentication allows you to list your current Kerberos tickets, " "and to request a new ticket (authenticate to the Kerberos Server). It also " @@ -1655,7 +1664,7 @@ msgstr "" "серверу Кербероса). Такође вас обавештава када истичу ваша пуномоћства " "Кербероса и сам их обнавља ако је могуће." -#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#: ../src/krb5-auth-dialog.appdata.xml.in.h:4 msgid "" "This is useful if you need to authenticate to a Kerberos Server (KDC) after " "your login to the desktop (e.g. on a mobile device)." @@ -1663,10 +1672,19 @@ msgstr "" "Ово је корисно ако треба да потврдите идентитет на серверу Кербероса (КДЦ) " "након што се пријавите на радну површ (тј. на преносивом уређају)." +#: ../src/krb5-auth-dialog.appdata.xml.in.h:5 +#| msgid "Kerberos Authentication" +msgid "Kerberos authentication dialog" +msgstr "Прозорче потврђивања идентитета Кербероса" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Прозорче мрежног потврђивања идентитета Кербероса" +#: ../src/krb5-auth-dialog.desktop.in.h:3 +msgid "kerberos;authentication;" +msgstr "керберос;потврда идентитета;" + #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:1 msgid "Kerberos principal" msgstr "Главник Кербероса" diff --git a/po/sr@latin.po b/po/sr@latin.po index 8a1538a..fa96daf 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -1,16 +1,16 @@ # Serbian translation for krb5-auth-dialog. # Copyright (C) 2013 krb5-auth-dialog's COPYRIGHT HOLDER # This file is distributed under the same license as the krb5-auth-dialog package. -# Miroslav Nikolić , 2013—2015. +# Miroslav Nikolić , 2013—2017. msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5" "-auth-dialog&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-06-10 16:57+0000\n" -"PO-Revision-Date: 2015-12-30 12:23+0200\n" +"POT-Creation-Date: 2016-10-04 19:47+0000\n" +"PO-Revision-Date: 2017-02-12 18:14+0200\n" "Last-Translator: Miroslav Nikolić \n" -"Language-Team: Serbian \n" +"Language-Team: Serbian <(nothing)>\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,7 +146,7 @@ msgstr "PKINIT" msgid "Notifications" msgstr "Obaveštenja" -#. Used in combination: 'Warn x minutes before expiry' +#. Used in combination: #: ../src/resources/ui/ka-preferences.ui.h:24 msgid "Warn" msgstr "Upozori" @@ -157,7 +157,7 @@ msgid "" "expires" msgstr "Šalje obaveštenje o isteku kupona onoliko minuta pre konačnog isteka" -#. Used in combination: 'Warn x minutes before expiry' +#. Used in combination: #: ../src/resources/ui/ka-preferences.ui.h:27 msgid "minutes before ticket expiry" msgstr "minuta pre isteka kupona" @@ -1609,7 +1609,6 @@ msgstr "%s greška" #: ../src/ka-pwdialog.c:309 #, c-format -#| msgid "Couldn't acquire kerberos ticket: '%s'" msgid "Couldn't acquire Kerberos ticket: '%s'" msgstr "Ne mogu da nabavim kupon Kerberosa: „%s“" @@ -1644,6 +1643,16 @@ msgstr "" " http://prevod.org — prevod na srpski jezik" #: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +#| msgid "Kerberos Network Authentication Dialog" +msgid "Kerberos Authentication Dialog" +msgstr "Prozorče potvrđivanja identiteta Kerberosa" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#| msgid "Requested Kerberos tickets should be:" +msgid "Request, renew and view Kerberos tickets" +msgstr "Zahtevajte, obnovite i pregledajte kupone Kerberosa" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:3 msgid "" "Kerberos Authentication allows you to list your current Kerberos tickets, " "and to request a new ticket (authenticate to the Kerberos Server). It also " @@ -1655,7 +1664,7 @@ msgstr "" "serveru Kerberosa). Takođe vas obaveštava kada ističu vaša punomoćstva " "Kerberosa i sam ih obnavlja ako je moguće." -#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#: ../src/krb5-auth-dialog.appdata.xml.in.h:4 msgid "" "This is useful if you need to authenticate to a Kerberos Server (KDC) after " "your login to the desktop (e.g. on a mobile device)." @@ -1663,10 +1672,19 @@ msgstr "" "Ovo je korisno ako treba da potvrdite identitet na serveru Kerberosa (KDC) " "nakon što se prijavite na radnu površ (tj. na prenosivom uređaju)." +#: ../src/krb5-auth-dialog.appdata.xml.in.h:5 +#| msgid "Kerberos Authentication" +msgid "Kerberos authentication dialog" +msgstr "Prozorče potvrđivanja identiteta Kerberosa" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Prozorče mrežnog potvrđivanja identiteta Kerberosa" +#: ../src/krb5-auth-dialog.desktop.in.h:3 +msgid "kerberos;authentication;" +msgstr "kerberos;potvrda identiteta;" + #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:1 msgid "Kerberos principal" msgstr "Glavnik Kerberosa" diff --git a/po/sv.po b/po/sv.po index 93db63b..76bb385 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,23 +1,25 @@ # Swedish translation for krb5-auth-dialog. -# Copyright © 2009-2016 Free Software Foundation, Inc. +# Copyright © 2009-2017 Free Software Foundation, Inc. # This file is distributed under the same license as the krb5-auth-dialog package. # Daniel Nylander , 2009, 2011. # Josef Andersson , 2016. +# Anders Jonsson , 2017. +# msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog\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: 2016-04-24 15:00+0000\n" -"PO-Revision-Date: 2016-05-25 15:36+0200\n" -"Last-Translator: Josef Andersson \n" +"POT-Creation-Date: 2016-10-20 21:49+0000\n" +"PO-Revision-Date: 2017-02-01 19:05+0100\n" +"Last-Translator: Anders Jonsson \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" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.8.11\n" "X-Project-Style: gnome\n" # Översättaranteckningar: @@ -1502,7 +1504,7 @@ msgstr[1] "Dina autentiseringsuppgifter går ut om %d minuter" #: ../src/ka-applet.c:665 ../src/ka-pwdialog.c:353 msgid "Your credentials have expired" -msgstr "Din autentiseringsuppgifter har förfallit" +msgstr "Dina autentiseringsuppgifter har förfallit" #: ../src/ka-applet.c:837 msgid "List Tickets" @@ -1538,7 +1540,7 @@ msgstr "Nätverksautentiseringsuppgifter förfaller" #: ../src/ka-applet.c:966 msgid "Network credentials expired" -msgstr "Nätverkautentiseringsuppgifters har förfallit" +msgstr "Nätverksautentiseringsuppgifter har förfallit" #: ../src/ka-applet.c:967 msgid "Your Kerberos credentials have expired." @@ -1650,6 +1652,14 @@ msgstr "" "." #: ../src/krb5-auth-dialog.appdata.xml.in.h:1 +msgid "Kerberos Authentication Dialog" +msgstr "Kerberos-autentiseringsdialog" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +msgid "Request, renew and view Kerberos tickets" +msgstr "Begär, förnya och visa Kerberos-biljetter" + +#: ../src/krb5-auth-dialog.appdata.xml.in.h:3 msgid "" "Kerberos Authentication allows you to list your current Kerberos tickets, " "and to request a new ticket (authenticate to the Kerberos Server). It also " @@ -1661,7 +1671,7 @@ msgstr "" "också när dina Kerberos-autentiseringsuppgifter är på väg att gå ut och " "förnyar din biljett automatiskt om möjligt." -#: ../src/krb5-auth-dialog.appdata.xml.in.h:2 +#: ../src/krb5-auth-dialog.appdata.xml.in.h:4 msgid "" "This is useful if you need to authenticate to a Kerberos Server (KDC) after " "your login to the desktop (e.g. on a mobile device)." @@ -1669,6 +1679,10 @@ msgstr "" "Detta är användbart om du behöver autentisera mot en Kerberos-server (KDC) " "efter att du loggat in till skrivbordet (t.ex. på en mobil enhet)." +#: ../src/krb5-auth-dialog.appdata.xml.in.h:5 +msgid "Kerberos authentication dialog" +msgstr "Kerberos-autentiseringsdialog" + #: ../src/krb5-auth-dialog.desktop.in.h:2 msgid "Kerberos Network Authentication Dialog" msgstr "Kerberos-nätverksautentiseringsdialog" diff --git a/po/uk.po b/po/uk.po index 2773d0f..e1940e2 100644 --- a/po/uk.po +++ b/po/uk.po @@ -13,6 +13,7 @@ msgstr "" "PO-Revision-Date: 2010-10-13 15:19+0300\n" "Last-Translator: Maxim Dziumanenko \n" "Language-Team: ukrainian >\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/zh_HK.po b/po/zh_HK.po index c5ecace..3780cc1 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2009-07-23 06:25+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 3a16934..fbb0682 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2009-07-22 17:00+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (traditional) \n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/secmem/Makefile.in b/secmem/Makefile.in index c0908af..3a3fe87 100644 --- a/secmem/Makefile.in +++ b/secmem/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -254,6 +254,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ diff --git a/secmem/secmem.c b/secmem/secmem.c index fc9ac2f..483b8e2 100644 --- a/secmem/secmem.c +++ b/secmem/secmem.c @@ -140,7 +140,7 @@ lock_pool( void *p, size_t n ) && errno != EAGAIN #endif ) - log_error("cant lock memory: %s\n", strerror(err)); + log_error("can't lock memory: %s\n", strerror(err)); show_warning = 1; } diff --git a/src/Makefile.in b/src/Makefile.in index d90d281..44077b0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -292,6 +292,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ diff --git a/src/ka-applet.c b/src/ka-applet.c index 195f781..50e6b70 100644 --- a/src/ka-applet.c +++ b/src/ka-applet.c @@ -209,7 +209,7 @@ GtkWindow *ka_applet_last_focused_window (KaApplet *self) static void -action_remove_credentails_cache (GSimpleAction *action G_GNUC_UNUSED, +action_remove_credentials_cache (GSimpleAction *action G_GNUC_UNUSED, GVariant *parameter G_GNUC_UNUSED, gpointer userdata) { @@ -255,7 +255,7 @@ action_help (GSimpleAction *action G_GNUC_UNUSED, KaApplet *self = KA_APPLET(userdata); GtkWindow *window = ka_applet_last_focused_window (self); - ka_show_help (gtk_window_get_screen (window), NULL, NULL); + ka_show_help (window, NULL); } static void @@ -360,13 +360,17 @@ static void ka_applet_startup (GApplication *application) { KaApplet *self = KA_APPLET (application); + GtkWindow *main_window; KA_DEBUG ("Primary application"); G_APPLICATION_CLASS (ka_applet_parent_class)->startup (application); self->priv->startup_ccache = ka_kerberos_init (self); - ka_main_window_create (self); + main_window = GTK_WINDOW(ka_main_window_create (self)); + gtk_window_set_transient_for(GTK_WINDOW(self->priv->pwdialog), + main_window); + self->priv->prefs = ka_preferences_new (self); ka_applet_app_menu_create(self); @@ -649,8 +653,8 @@ ka_applet_tooltip_text (int remaining) if (remaining >= 3600) { hours = remaining / 3600; minutes = (remaining % 3600) / 60; - /* Translators: First number is hours, second number is minutes */ tooltip_text = + /* Translators: First number is hours, second number is minutes */ g_strdup_printf (_("Your credentials expire in %.2d:%.2dh"), hours, minutes); } else { @@ -983,7 +987,7 @@ ka_applet_update_status (KaApplet *applet, krb5_timestamp expiry) static GActionEntry trayicon_entries[] = { - { "remove_credentials_cache", action_remove_credentails_cache, NULL, NULL, NULL, {0} }, + { "remove_credentials_cache", action_remove_credentials_cache, NULL, NULL, NULL, {0} }, { "list_tickets", action_list_tickets, NULL, NULL, NULL, {0} }, { "preferences", action_preferences, NULL, NULL, NULL, {0} }, { "about", action_about, NULL, NULL, NULL, {0} }, @@ -1195,8 +1199,10 @@ ka_applet_destroy (KaApplet* self) gtk_widget_destroy (GTK_WIDGET(self->priv->prefs)); self->priv->prefs = NULL; - gtk_widget_destroy (GTK_WIDGET(self->priv->context_menu)); - self->priv->context_menu = NULL; + if (self->priv->context_menu) { + gtk_widget_destroy (GTK_WIDGET(self->priv->context_menu)); + self->priv->context_menu = NULL; + } ka_kerberos_destroy (); } diff --git a/src/ka-kerberos.c b/src/ka-kerberos.c index 14fb03e..6526a72 100644 --- a/src/ka-kerberos.c +++ b/src/ka-kerberos.c @@ -41,11 +41,7 @@ #include "ka-main-window.h" #ifdef ENABLE_NETWORK_MANAGER -#include - -#if !defined(NM_CHECK_VERSION) -#define NM_CHECK_VERSION(x,y,z) 0 -#endif +# include #endif #ifdef HAVE_HX509_ERR_H @@ -222,6 +218,9 @@ credentials_expiring_real (KaApplet *applet) krb5_timestamp now; gboolean retval = FALSE; + if (!kcontext_valid) + return retval; + memset (&my_creds, 0, sizeof (my_creds)); ka_applet_set_tgt_renewable (applet, FALSE); if (!ka_get_tgt_from_ccache (kcontext, &my_creds)) { @@ -318,22 +317,22 @@ ka_get_service_tickets (GtkListStore * tickets, gboolean hide_conf_tickets) g_return_val_if_fail (!ret, FALSE); ret = krb5_cc_start_seq_get (kcontext, ccache, &cursor); - if (ret) { + if (ret == KRB5_FCC_NOFILE) { ka_log_error_message_at_level (G_LOG_LEVEL_INFO, "krb5_cc_start_seq_get", kcontext, ret); - /* if the file doesn't exist, it's not an error if we can't - * parse it */ - if (!g_file_test (ka_ccache_filename (), G_FILE_TEST_EXISTS)) - gtk_list_store_append (tickets, &iter); - gtk_list_store_set (tickets, &iter, - PRINCIPAL_COLUMN, _("Your ticket cache is currently empty"), - FORWARDABLE_COLUMN, FALSE, - RENEWABLE_COLUMN, FALSE, - PROXIABLE_COLUMN, FALSE, -1); - retval = TRUE; + gtk_list_store_append (tickets, &iter); + gtk_list_store_set (tickets, &iter, + PRINCIPAL_COLUMN, _("Your ticket cache is currently empty"), + FORWARDABLE_COLUMN, FALSE, + RENEWABLE_COLUMN, FALSE, + PROXIABLE_COLUMN, FALSE, -1); + retval = TRUE; + goto out; + } else if (ret) { goto out; } + while ((ret = krb5_cc_next_cred (kcontext, ccache, &cursor, &creds)) == 0) { gboolean renewable, proxiable, forwardable; @@ -467,7 +466,7 @@ auth_dialog_prompter (krb5_context ctx G_GNUC_UNUSED, goto cleanup; if (password_len + 1 > prompts[i].reply->length) { g_warning ("Password too long %d/%zd", password_len + 1, - prompts[i].reply->length); + (size_t)prompts[i].reply->length); goto cleanup; } @@ -500,20 +499,14 @@ ka_nm_client_state_changed_cb (NMClient * client, KA_DEBUG ("Network state: %d", state); /* do nothing */ break; -#if NM_CHECK_VERSION(0,8,992) case NM_STATE_DISCONNECTING: -#endif case NM_STATE_DISCONNECTED: KA_DEBUG ("Network disconnected"); *online = FALSE; break; -#if NM_CHECK_VERSION(0,8,992) case NM_STATE_CONNECTED_LOCAL: case NM_STATE_CONNECTED_SITE: case NM_STATE_CONNECTED_GLOBAL: -#else - case NM_STATE_CONNECTED: -#endif KA_DEBUG ("Network connected"); *online = TRUE; break; @@ -529,7 +522,7 @@ credentials_expiring (gpointer *data) KA_DEBUG ("Checking expiry <%ds", ka_applet_get_pw_prompt_secs (applet)); if (credentials_expiring_real (applet) && is_online) { - KA_DEBUG ("Expiry @ %ld", creds_expiry); + KA_DEBUG ("Expiry @ %ld", (long int)creds_expiry); if (!ka_renew_credentials (applet)) KA_DEBUG ("Credentials renewed"); @@ -947,8 +940,8 @@ static gboolean ka_krb5_context_free () { if (kcontext_valid) { - krb5_free_context (kcontext); kcontext_valid = FALSE; + krb5_free_context (kcontext); } return TRUE; } @@ -1093,16 +1086,19 @@ static gboolean ka_nm_init (void) { #ifdef ENABLE_NETWORK_MANAGER - nm_client = nm_client_new (); + GError *error = NULL; + + nm_client = nm_client_new (NULL, &error); if (!nm_client) { - g_warning ("Could not initialize nm-client"); - } else { - g_signal_connect (nm_client, "notify::state", - G_CALLBACK (ka_nm_client_state_changed_cb), - &is_online); - /* Set initial state */ - ka_nm_client_state_changed_cb (nm_client, NULL, &is_online); + g_warning ("Could not initialize nm-client: %s", error->message); + g_error_free (error); + return FALSE; } + g_signal_connect (nm_client, "notify::state", + G_CALLBACK (ka_nm_client_state_changed_cb), + &is_online); + /* Set initial state */ + ka_nm_client_state_changed_cb (nm_client, NULL, &is_online); #endif /* ENABLE_NETWORK_MANAGER */ return TRUE; } @@ -1114,7 +1110,7 @@ ka_kerberos_init (KaApplet *applet) gboolean ret; ka_secmem_init (); - ret = ka_krb5_context_init (applet); + ret = ka_krb5_context_init (); ka_nm_init (); g_timeout_add_seconds (CREDENTIAL_CHECK_INTERVAL, (GSourceFunc) credentials_expiring, applet); diff --git a/src/ka-main-window.c b/src/ka-main-window.c index 21b1dbc..1509b20 100644 --- a/src/ka-main-window.c +++ b/src/ka-main-window.c @@ -30,6 +30,7 @@ #include "ka-preferences.h" static GtkListStore *tickets; +static GtkButton *ticket_btn; static GtkApplicationWindow *main_window; static void @@ -44,6 +45,26 @@ ccache_changed_cb (KaApplet* applet, } +static void +enable_ticket_button_cb (gpointer* applet G_GNUC_UNUSED, + gchar *princ G_GNUC_UNUSED, + guint when G_GNUC_UNUSED, + gpointer user_data) +{ + gboolean enable = GPOINTER_TO_UINT(user_data); + KA_DEBUG ("Sensitive: %u", enable); + gtk_widget_set_sensitive(GTK_WIDGET(ticket_btn), enable); +} + + +static void +ticket_btn_clicked(GtkButton* btn G_GNUC_UNUSED, gpointer user_data) +{ + KaApplet *applet = KA_APPLET(user_data); + ka_grab_credentials (applet); +} + + GtkApplicationWindow * ka_main_window_create (KaApplet *applet) { @@ -117,6 +138,17 @@ ka_main_window_create (KaApplet *applet) G_CALLBACK(ccache_changed_cb), NULL); + ticket_btn = + GTK_BUTTON (gtk_builder_get_object (builder, "get_ticket_btn")); + g_signal_connect(ticket_btn, "clicked", G_CALLBACK(ticket_btn_clicked), applet); + + g_signal_connect (applet, "krb-tgt-acquired", + G_CALLBACK (enable_ticket_button_cb), + GUINT_TO_POINTER(FALSE)); + + g_signal_connect (applet, "krb-tgt-expired", + G_CALLBACK (enable_ticket_button_cb), + GUINT_TO_POINTER(TRUE)); g_object_unref (builder); return main_window; } diff --git a/src/ka-pwdialog.c b/src/ka-pwdialog.c index 0cca259..7d51344 100644 --- a/src/ka-pwdialog.c +++ b/src/ka-pwdialog.c @@ -168,57 +168,24 @@ ka_pwdialog_new (void) return pwdialog; } - -static GdkGrabStatus -for_each_keyboard (GdkWindow *window, GdkEvent *event, - GdkGrabStatus (*func)(GdkDevice*, - GdkWindow*, - GdkEvent*)) -{ - GdkDisplay *display; - GdkDeviceManager *device_manager; - GdkDevice *device; - GList *devices, *dev; - GdkGrabStatus ret = GDK_GRAB_SUCCESS; - - display = gdk_window_get_display (window); - device_manager = gdk_display_get_device_manager (display); - devices = gdk_device_manager_list_devices (device_manager, - GDK_DEVICE_TYPE_MASTER); - - for (dev = devices; dev; dev = dev->next) { - device = dev->data; - if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD) - continue; - ret = (*func)(device, window, event); - } - - g_list_free (devices); - return ret; -} - -static GdkGrabStatus -grab_keyboard_func (GdkDevice *device, GdkWindow *window, GdkEvent *event) -{ - return gdk_device_grab (device, - window, - GDK_OWNERSHIP_WINDOW, - FALSE, - GDK_ALL_EVENTS_MASK, - NULL, - gdk_event_get_time (event)); -} - static gboolean grab_keyboard (GtkWidget *win, GdkEvent * event, gpointer data) { KaPwDialog *pwdialog = KA_PWDIALOG (data); GdkGrabStatus status; + GdkWindow *window = gtk_widget_get_window(win); + gtk_grab_add(win); if (!pwdialog->priv->grabbed) { - status = for_each_keyboard(gtk_widget_get_window (win), - event, - &grab_keyboard_func); + status = gdk_seat_grab (gdk_display_get_default_seat( + gdk_window_get_display (window)), + window, + GDK_SEAT_CAPABILITY_ALL, + TRUE, + NULL, + event, + NULL, + NULL); if (status == GDK_GRAB_SUCCESS) pwdialog->priv->grabbed = TRUE; @@ -228,26 +195,19 @@ grab_keyboard (GtkWidget *win, GdkEvent * event, gpointer data) return FALSE; } -static GdkGrabStatus -ungrab_keyboard_func (GdkDevice *device, - GdkWindow *window G_GNUC_UNUSED, - GdkEvent *event) -{ - gdk_device_ungrab (device, - gdk_event_get_time (event)); - return 0; -} static gboolean -ungrab_keyboard (GtkWidget *win G_GNUC_UNUSED, - GdkEvent * event, gpointer data) +ungrab_keyboard (GtkWidget *win, + GdkEvent *event G_GNUC_UNUSED, gpointer data) { KaPwDialog *pwdialog = KA_PWDIALOG (data); + GdkWindow *window = gtk_widget_get_window(win); if (pwdialog->priv->grabbed) { - for_each_keyboard(gtk_widget_get_window (win), - event, - &ungrab_keyboard_func); + gtk_grab_remove (win); + gdk_seat_ungrab (gdk_display_get_default_seat( + gdk_window_get_display (window))); + pwdialog->priv->grabbed = FALSE; } return FALSE; diff --git a/src/ka-tools.c b/src/ka-tools.c index ae93803..1dbc94a 100644 --- a/src/ka-tools.c +++ b/src/ka-tools.c @@ -21,7 +21,7 @@ #include "ka-tools.h" void -ka_show_help (GdkScreen* screen, const char* chapter, GtkWindow* window) +ka_show_help (GtkWindow* window, const char* chapter) { GError *error = NULL; const char *section = ""; @@ -32,8 +32,7 @@ ka_show_help (GdkScreen* screen, const char* chapter, GtkWindow* window) url = g_strdup_printf("help:krb5-auth-dialog%s", section); - gtk_show_uri (screen, url, gtk_get_current_event_time (), &error); - + gtk_show_uri_on_window (window, url, gtk_get_current_event_time (), &error); if (error) { GtkWidget *message_dialog; diff --git a/src/ka-tools.h b/src/ka-tools.h index 9cbf1ae..3263b8e 100644 --- a/src/ka-tools.h +++ b/src/ka-tools.h @@ -25,7 +25,7 @@ G_BEGIN_DECLS -void ka_show_help (GdkScreen* screen, const char* section, GtkWindow* window); +void ka_show_help (GtkWindow* window, const char* section); void ka_show_about (KaApplet *applet); G_END_DECLS diff --git a/src/krb5-auth-dialog.1.in b/src/krb5-auth-dialog.1.in index 2a9867e..7630fd5 100644 --- a/src/krb5-auth-dialog.1.in +++ b/src/krb5-auth-dialog.1.in @@ -17,8 +17,11 @@ credentials, prompting the user for whatever information is necessary. .TP \fB--auto\fR -If this option is specified, \fBkrb5-auth-dialog\fR will exit if it finds that the -user has no Kerberos credentials. +If this option is specified, \fkrb5-auth-dialog\f will start only if it +finds that the user has Kerberos credentials. This may be used to +ensure that only users who actually use Kerberos see the program. +Note that in some settings, users may authenticate to Kerberos at a +later time even if they do not have Kerberos credentials initially. .SH "SEE ALSO" .BR krb5.conf (5) diff --git a/src/krb5-auth-dialog.appdata.xml.in b/src/krb5-auth-dialog.appdata.xml.in index b3e6ad2..09a53bc 100644 --- a/src/krb5-auth-dialog.appdata.xml.in +++ b/src/krb5-auth-dialog.appdata.xml.in @@ -1,8 +1,10 @@ - - krb5-auth-dialog.desktop - CC0 + + krb5-auth-dialog.desktop + CC0-1.0 + <_name>Kerberos Authentication Dialog + <_summary>Request, renew and view Kerberos tickets <_p> Kerberos Authentication allows you to list your current Kerberos tickets, @@ -16,14 +18,21 @@ - http://honk.sigxcpu.org/con/images/krb5-auth-dialog-pkinit.png + + http://honk.sigxcpu.org/con/images/krb5-auth-dialog-pkinit.png + <_caption>Kerberos authentication dialog + https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/ - agx_at_sigxcpu.org + agx_at_sigxcpu.org AppMenu HiDpiIcon ModernToolkit Notifications - + GPL-2.0+ + Guido Günther + https://bugzilla.gnome.org/enter_bug.cgi?product=krb5-auth-dialog + https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/ + diff --git a/src/resources.c b/src/resources.c index 6428ecc..5373ac6 100644 --- a/src/resources.c +++ b/src/resources.c @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[31908]; const double alignment; void * const ptr;} krb5_auth_dialog_resource_data = { { +static const SECTION union { const guint8 data[32340]; const double alignment; void * const ptr;} krb5_auth_dialog_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, @@ -33,19 +33,19 @@ static const SECTION union { const guint8 data[31908]; const double alignment; v 0xf8, 0x74, 0x00, 0x00, 0x0c, 0x75, 0x00, 0x00, 0x4b, 0x97, 0x0c, 0x39, 0x04, 0x00, 0x00, 0x00, 0x0c, 0x75, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, - 0x20, 0x75, 0x00, 0x00, 0xbc, 0x79, 0x00, 0x00, + 0x20, 0x75, 0x00, 0x00, 0x6b, 0x7b, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, 0x00, 0x00, 0x00, 0x00, - 0xbc, 0x79, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, - 0xc0, 0x79, 0x00, 0x00, 0xc4, 0x79, 0x00, 0x00, + 0x6b, 0x7b, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, + 0x70, 0x7b, 0x00, 0x00, 0x74, 0x7b, 0x00, 0x00, 0x6f, 0x1c, 0x9b, 0x44, 0x09, 0x00, 0x00, 0x00, - 0xc4, 0x79, 0x00, 0x00, 0x11, 0x00, 0x4c, 0x00, - 0xd8, 0x79, 0x00, 0x00, 0xdc, 0x79, 0x00, 0x00, + 0x74, 0x7b, 0x00, 0x00, 0x11, 0x00, 0x4c, 0x00, + 0x88, 0x7b, 0x00, 0x00, 0x8c, 0x7b, 0x00, 0x00, 0xab, 0x84, 0xc8, 0x77, 0x04, 0x00, 0x00, 0x00, - 0xdc, 0x79, 0x00, 0x00, 0x0b, 0x00, 0x76, 0x00, - 0xe8, 0x79, 0x00, 0x00, 0x97, 0x7c, 0x00, 0x00, + 0x8c, 0x7b, 0x00, 0x00, 0x0b, 0x00, 0x76, 0x00, + 0x98, 0x7b, 0x00, 0x00, 0x47, 0x7e, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, 0x06, 0x00, 0x00, 0x00, - 0x97, 0x7c, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, - 0xa0, 0x7c, 0x00, 0x00, 0xa4, 0x7c, 0x00, 0x00, + 0x47, 0x7e, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, + 0x50, 0x7e, 0x00, 0x00, 0x54, 0x7e, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x74, 0x72, 0x61, 0x79, 0x2d, 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x6d, 0x65, 0x6e, 0x75, 0x2e, 0x75, @@ -3755,7 +3755,7 @@ static const SECTION union { const guint8 data[31908]; const double alignment; v 0x01, 0x00, 0x00, 0x00, 0x6b, 0x61, 0x2d, 0x6d, 0x61, 0x69, 0x6e, 0x2d, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, - 0x8c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3b, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -3764,78 +3764,149 @@ static const SECTION union { const guint8 data[31908]; const double alignment; v 0x21, 0x2d, 0x2d, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x67, 0x6c, 0x61, 0x64, 0x65, - 0x20, 0x33, 0x2e, 0x31, 0x38, 0x2e, 0x33, 0x20, + 0x20, 0x33, 0x2e, 0x32, 0x30, 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x3c, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, 0x20, 0x6c, 0x69, 0x62, 0x3d, 0x22, 0x67, 0x74, 0x6b, 0x2b, 0x22, 0x20, 0x76, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x33, 0x2e, 0x30, - 0x22, 0x2f, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, 0x6a, - 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x64, 0x6a, - 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x31, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, 0x72, 0x22, - 0x3e, 0x31, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x74, 0x65, 0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x33, 0x2e, 0x31, + 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, + 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x64, + 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, + 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, - 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, 0x72, + 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x41, 0x70, 0x70, 0x6c, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x69, - 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6b, 0x72, 0x62, 0x35, 0x5f, 0x6d, - 0x61, 0x69, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 0x64, - 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x74, 0x65, 0x70, 0x5f, 0x69, 0x6e, 0x63, + 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, + 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x20, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x41, 0x70, 0x70, 0x6c, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, + 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6b, 0x72, 0x62, 0x35, 0x5f, + 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x77, 0x69, 0x6e, + 0x64, 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x20, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, + 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x6e, 0x64, + 0x6f, 0x77, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, + 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x72, 0x3d, 0x22, 0x6b, 0x61, 0x5f, 0x6d, 0x61, + 0x69, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, + 0x77, 0x5f, 0x68, 0x69, 0x64, 0x65, 0x22, 0x20, + 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, + 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, + 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x67, 0x72, 0x69, 0x64, 0x31, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x6e, 0x64, 0x6f, - 0x77, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, - 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, - 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x64, 0x65, 0x6c, 0x65, 0x74, - 0x65, 0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, - 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, - 0x3d, 0x22, 0x6b, 0x61, 0x5f, 0x6d, 0x61, 0x69, - 0x6e, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, - 0x5f, 0x68, 0x69, 0x64, 0x65, 0x22, 0x20, 0x73, - 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, - 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, - 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x67, 0x72, 0x69, 0x64, 0x31, 0x22, 0x3e, 0x3c, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x72, + 0x65, 0x65, 0x56, 0x69, 0x65, 0x77, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6b, 0x72, 0x62, 0x35, + 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73, + 0x5f, 0x74, 0x72, 0x65, 0x65, 0x76, 0x69, 0x65, + 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x6c, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x74, 0x72, 0x65, 0x65, + 0x76, 0x69, 0x65, 0x77, 0x2d, 0x73, 0x65, 0x6c, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, + 0x70, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x61, + 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -3848,61 +3919,44 @@ static const SECTION union { const guint8 data[31908]; const double alignment; v 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, + 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x72, 0x65, - 0x65, 0x56, 0x69, 0x65, 0x77, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6b, 0x72, 0x62, 0x35, 0x5f, - 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x5f, - 0x74, 0x72, 0x65, 0x65, 0x76, 0x69, 0x65, 0x77, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x67, 0x65, 0x74, 0x5f, 0x74, 0x69, 0x63, + 0x6b, 0x65, 0x74, 0x5f, 0x62, 0x74, 0x6e, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x6c, 0x65, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x74, 0x72, 0x65, 0x65, 0x76, - 0x69, 0x65, 0x77, 0x2d, 0x73, 0x65, 0x6c, 0x65, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x47, 0x65, + 0x74, 0x20, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, - 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29, 0x6f, 0x72, 0x67, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, + 0x61, 0x79, 0x29, 0x6f, 0x72, 0x67, 0x2f, 0x00, 0x09, 0x00, 0x00, 0x00, 0x6b, 0x72, 0x62, 0x35, 0x2d, 0x61, 0x75, 0x74, 0x68, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x00, 0x00, 0x00, diff --git a/src/resources/ui/ka-main-window.ui b/src/resources/ui/ka-main-window.ui index 47d1fbe..8554521 100644 --- a/src/resources/ui/ka-main-window.ui +++ b/src/resources/ui/ka-main-window.ui @@ -1,7 +1,7 @@ - + - + 100 1 @@ -32,5 +32,19 @@ + + + True + False + True + + + True + False + Get Ticket + + + + diff --git a/ylwrap b/ylwrap index 7c2d927..d788f2d 100755 --- a/ylwrap +++ b/ylwrap @@ -1,9 +1,9 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2013-01-12.17; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # Written by Tom Tromey . # @@ -242,6 +242,6 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: -- cgit