Merge tag 'upstream/3.20.0' into debian/sid

Upstream version 3.20.0

# gpg: Signature made Do 21 Jul 2016 13:25:02 SAST
# gpg:                using RSA key 0x07B8B7B0EA98120B
# gpg: please do a --check-trustdb
# gpg: Good signature from "Guido Günther <agx@sigxcpu.org>" [ultimate]
# gpg:                 aka "Guido Günther <gg@godiug.net>" [ultimate]
# gpg:                 aka "Guido Günther <agx@debian.org>" [ultimate]
# gpg:                 aka "Guido Günther <guido@xcpu.ch>" [ultimate]
# Primary key fingerprint: D343 9DAA 19DC FACD AE87  9CF2 B999 CDB5 8C8D DBD2
#      Subkey fingerprint: BC7C D072 3875 EBAD 05DF  1CD9 07B8 B7B0 EA98 120B

1 files changed, 142 insertions, 144 deletions

diff --git a/po/sr@latin.po b/po/sr@latin.po
index 86eeffc..8a1538a 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,14 +1,14 @@
 # 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ć <miroslavnikolic@rocketmail.com>, 2013—2014.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2013—2015.
 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: 2014-10-23 17:47+0000\n"
-"PO-Revision-Date: 2014-10-27 05:48+0200\n"
+"POT-Creation-Date: 2015-06-10 16:57+0000\n"
+"PO-Revision-Date: 2015-12-30 12:23+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -19,121 +19,118 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../src/krb5-auth-dialog.ui.h:1
+#: ../src/resources/ui/app-menu.ui.h:1
 msgid "Prefere_nces"
 msgstr "_Postavke"
 
-#: ../src/krb5-auth-dialog.ui.h:2
+#: ../src/resources/ui/app-menu.ui.h:2
 msgid "_About"
 msgstr "_O programu"
 
-#. Help item
-#: ../src/krb5-auth-dialog.ui.h:3 ../src/ka-applet.c:985
+#: ../src/resources/ui/app-menu.ui.h:3
+#: ../src/resources/ui/tray-icon-menu.ui.h:3
 msgid "_Help"
 msgstr "Po_moć"
 
-#. Quit
-#: ../src/krb5-auth-dialog.ui.h:4 ../src/ka-applet.c:993
+#: ../src/resources/ui/app-menu.ui.h:4
+#: ../src/resources/ui/tray-icon-menu.ui.h:4
 msgid "_Quit"
 msgstr "_Izađi"
 
-#.
-#. * 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 "Potvrda identiteta Kerberosa"
+#: ../src/resources/ui/tray-icon-menu.ui.h:1
+msgid "Remove Credentials _Cache"
+msgstr "Ukloni _ostavu punomoćstva"
 
-#: ../src/krb5-auth-dialog.ui.h:6
-msgid "_Renew Ticket"
-msgstr "_Obnovi kupon"
+#: ../src/resources/ui/tray-icon-menu.ui.h:2
+msgid "_List Tickets"
+msgstr "_Ispiši kupone"
 
-#: ../src/krb5-auth-dialog.ui.h:7
+#: ../src/resources/ui/ka-main-window.ui.h:1
 msgid "Service Tickets"
 msgstr "Kuponi usluge"
 
-#: ../src/krb5-auth-dialog.ui.h:8
+#: ../src/resources/ui/ka-preferences.ui.h:1
 msgid "Kerberos User"
 msgstr "Korisnik Kerberosa"
 
-#: ../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 ""
 "Naziv vašeg naloga Kerberosa. Ostavite praznim da koristite vaše trenutno "
 "korisničko ime."
 
-#: ../src/krb5-auth-dialog.ui.h:10
+#: ../src/resources/ui/ka-preferences.ui.h:3
 msgid "Kerberos principal:"
 msgstr "Glavnik Kerberosa:"
 
-#: ../src/krb5-auth-dialog.ui.h:11
+#: ../src/resources/ui/ka-preferences.ui.h:4
 msgid "Kerberos Ticket Options"
 msgstr "Mogućnosti kupona Kerberosa"
 
-#: ../src/krb5-auth-dialog.ui.h:12
+#: ../src/resources/ui/ka-preferences.ui.h:5
 msgid "Requested Kerberos tickets should be:"
 msgstr "Zahtevani kuponi Kerberosa treba da budu:"
 
-#: ../src/krb5-auth-dialog.ui.h:13
+#: ../src/resources/ui/ka-preferences.ui.h:6
 msgid "forwardable"
 msgstr "prosledljivi"
 
-#: ../src/krb5-auth-dialog.ui.h:14
+#: ../src/resources/ui/ka-preferences.ui.h:7
 msgid "If checked, request forwardable tickets"
 msgstr "Ako je izabrano, zahteva prosledljive kupone"
 
-#: ../src/krb5-auth-dialog.ui.h:15
+#: ../src/resources/ui/ka-preferences.ui.h:8
 msgid "renewable"
 msgstr "obnovljivi"
 
-#: ../src/krb5-auth-dialog.ui.h:16
+#: ../src/resources/ui/ka-preferences.ui.h:9
 msgid "If checked, request renewable tickets"
 msgstr "Ako je izabrano, zahteva obnovljive kupone"
 
-#: ../src/krb5-auth-dialog.ui.h:17
+#: ../src/resources/ui/ka-preferences.ui.h:10
 msgid "proxiable"
 msgstr "posredljivi"
 
-#: ../src/krb5-auth-dialog.ui.h:18
+#: ../src/resources/ui/ka-preferences.ui.h:11
 msgid "If checked, request proxiable tickets"
 msgstr "Ako je izabrano, zahteva posredljive kupone"
 
-#: ../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 "IB korisnika"
 
-#: ../src/krb5-auth-dialog.ui.h:21
+#: ../src/resources/ui/ka-preferences.ui.h:14
 msgid "Use Smartcard"
 msgstr "Koristi pametnu karticu"
 
-#: ../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 ""
 "Ako je izabrano, koristi bezbednosni modul (pametnu karticu) za potvrđivanje "
 "identiteta."
 
-#: ../src/krb5-auth-dialog.ui.h:23
+#: ../src/resources/ui/ka-preferences.ui.h:16
 msgid "Certificate and private key used for authentication"
 msgstr "Uverenje i lični ključ korišćeni za potvrđivanje identiteta"
 
-#: ../src/krb5-auth-dialog.ui.h:24
+#: ../src/resources/ui/ka-preferences.ui.h:17
 msgid "_Browse..."
 msgstr "_Razgledaj..."
 
-#: ../src/krb5-auth-dialog.ui.h:25
+#: ../src/resources/ui/ka-preferences.ui.h:18
 msgid "X509 trust anchors"
 msgstr "Oslonci Iks509 poverenja"
 
-#: ../src/krb5-auth-dialog.ui.h:26
+#: ../src/resources/ui/ka-preferences.ui.h:19
 msgid "Certificate used to verify digital signatures."
 msgstr "Uverenje korišćeno za proveru digitalnih potpisa."
 
-#: ../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."
@@ -141,81 +138,42 @@ msgstr ""
 "Podesite korišćenje uverenja i pametnih kartica za vaše potvrđivanje identiteta "
 "Kerberos mreže."
 
-#: ../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 "Obaveštenja"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../src/krb5-auth-dialog.ui.h:31
+#: ../src/resources/ui/ka-preferences.ui.h:24
 msgid "Warn"
 msgstr "Upozori"
 
-#: ../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 "Šalje obaveštenje o isteku kupona onoliko minuta pre konačnog isteka"
 
 #. Used in combination: 'Warn x minutes before expiry'
-#: ../src/krb5-auth-dialog.ui.h:34
+#: ../src/resources/ui/ka-preferences.ui.h:27
 msgid "minutes before ticket expiry"
 msgstr "minuta pre isteka kupona"
 
-#: ../src/ka-kerberos.c:176
-msgid "unknown error"
-msgstr "nepoznata greška"
-
-#: ../src/ka-kerberos.c:318
-msgid "Your ticket cache is currently empty"
-msgstr "Ostava vašeg kupona je trenutno prazna"
-
-#: ../src/ka-kerberos.c:349
-msgid "Expired"
-msgstr "Isteklo"
-
-#: ../src/ka-kerberos.c:1038
-msgid " (No network connection)"
-msgstr " (Nema mrežne veze)"
-
-#: ../src/ka-pwdialog.c:229
-#, c-format
-msgid "Couldn't acquire kerberos ticket: '%s'"
-msgstr "Ne mogu da nabavim kupon kerberosa: „%s“"
-
-#: ../src/ka-pwdialog.c:268 ../src/ka-applet.c:576
-#, c-format
-msgid "Your credentials expire in %d minute"
-msgid_plural "Your credentials expire in %d minutes"
-msgstr[0] "Vaša punomoćstva ističu za %d minut"
-msgstr[1] "Vaša punomoćstva ističu za %d minuta"
-msgstr[2] "Vaša punomoćstva ističu za %d minuta"
-msgstr[3] "Vaša punomoćstva ističu za jedan minut"
-
-#: ../src/ka-pwdialog.c:273 ../src/ka-applet.c:581
-msgid "Your credentials have expired"
-msgstr "Vaša punomoćstva su istekla"
-
-#: ../src/ka-pwdialog.c:296
-msgid "Please enter your Kerberos password:"
-msgstr "Unesite vašu lozinku Kerberosa:"
-
-#: ../src/ka-pwdialog.c:309
-#, c-format
-msgid "Please enter the password for '%s':"
-msgstr "Unesite lozinku za „%s“:"
+#: ../src/resources/ui/ka-pwdialog.ui.h:1
+#: ../src/krb5-auth-dialog.desktop.in.h:1
+msgid "Kerberos Authentication"
+msgstr "Potvrda identiteta Kerberosa"
 
-#: ../src/ka-pwdialog.c:327
-msgid "The password you entered is invalid"
-msgstr "Lozinka koju ste uneli je neispravna"
+#: ../src/resources/ui/ka-pwdialog.ui.h:2 ../src/ka-preferences.c:372
+msgid "_Cancel"
+msgstr "Ot_kaži"
 
-#: ../src/ka-pwdialog.c:343
-#, c-format
-msgid "%s Error"
-msgstr "%s greška"
+#: ../src/resources/ui/ka-pwdialog.ui.h:3
+msgid "_Renew Ticket"
+msgstr "_Obnovi kupon"
 
 #. Translators: files from dummy-strings.c are *all* possible errors
 #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in
@@ -1523,131 +1481,167 @@ msgstr "Loš čarobni broj za GSSAPI IUB"
 msgid "Bad magic number for GSSAPI QUEUE"
 msgstr "Loš čarobni broj za GSSAPI RED"
 
-#: ../src/ka-applet.c:570
+#: ../src/ka-applet.c:654
 #, c-format
 msgid "Your credentials expire in %.2d:%.2dh"
 msgstr "Vaša punomoćstva ističu za %.2d:%.2d"
 
-#: ../src/ka-applet.c:763
+#: ../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] "Vaša punomoćstva ističu za %d minut"
+msgstr[1] "Vaša punomoćstva ističu za %d minuta"
+msgstr[2] "Vaša punomoćstva ističu za %d minuta"
+msgstr[3] "Vaša punomoćstva ističu za jedan minut"
+
+#: ../src/ka-applet.c:665 ../src/ka-pwdialog.c:353
+msgid "Your credentials have expired"
+msgstr "Vaša punomoćstva su istekla"
+
+#: ../src/ka-applet.c:837
 msgid "List Tickets"
 msgstr "Ispiši kupone"
 
-#: ../src/ka-applet.c:773
+#: ../src/ka-applet.c:847
 msgid "Get Ticket"
 msgstr "Dobavi kupon"
 
-#: ../src/ka-applet.c:782
+#: ../src/ka-applet.c:856
 msgid "Don't show me this again"
 msgstr "Ne prikazuj mi više ovo"
 
-#: ../src/ka-applet.c:789
+#: ../src/ka-applet.c:863
 msgid "Remove Credentials Cache"
 msgstr "Ukloni ostavu punomoćstva"
 
-#: ../src/ka-applet.c:849
+#: ../src/ka-applet.c:925
 msgid "You have valid Kerberos credentials."
 msgstr "Imate ispravna punomoćstva Kerberosa."
 
-#: ../src/ka-applet.c:851
+#: ../src/ka-applet.c:927
 msgid "You've refreshed your Kerberos credentials."
 msgstr "Osvežili ste vaša punomoćstva Kerberosa."
 
-#: ../src/ka-applet.c:854
+#: ../src/ka-applet.c:930
 msgid "Network credentials valid"
 msgstr "Punomoćstva mreže su ispravna"
 
-#: ../src/ka-applet.c:873
+#: ../src/ka-applet.c:949
 msgid "Network credentials expiring"
 msgstr "Punomoćstva mreže ističu"
 
-#: ../src/ka-applet.c:890
+#: ../src/ka-applet.c:966
 msgid "Network credentials expired"
 msgstr "Punomoćstva mreže su istekla"
 
-#: ../src/ka-applet.c:891
+#: ../src/ka-applet.c:967
 msgid "Your Kerberos credentials have expired."
 msgstr "Vaša punomoćstva Kerberosa su istekla."
 
-#: ../src/ka-applet.c:970
-msgid "Remove Credentials _Cache"
-msgstr "Ukloni _ostavu punomoćstva"
+#: ../src/ka-kerberos.c:176
+msgid "unknown error"
+msgstr "nepoznata greška"
 
-#. Ticket dialog
-#: ../src/ka-applet.c:979
-msgid "_List Tickets"
-msgstr "_Ispiši kupone"
+#: ../src/ka-kerberos.c:329
+msgid "Your ticket cache is currently empty"
+msgstr "Ostava vašeg kupona je trenutno prazna"
 
-#: ../src/ka-tools.c:44
-#, c-format
-msgid ""
-"There was an error displaying help:\n"
-"%s"
-msgstr ""
-"Došlo je do greške prikazivanja pomoći:\n"
-"%s"
+#: ../src/ka-kerberos.c:360
+msgid "Expired"
+msgstr "Isteklo"
 
-#. Translators: add the translators of your language here
-#: ../src/ka-tools.c:84
-msgid "translator-credits"
-msgstr ""
-"  Miroslav Nikolić\n"
-"\n"
-"  http://prevod.org — prevod na srpski jezik"
+#: ../src/ka-kerberos.c:1049
+msgid " (No network connection)"
+msgstr " (Nema mrežne veze)"
 
-#: ../src/ka-main-window.c:74
+#: ../src/ka-main-window.c:77
 msgid "Principal"
 msgstr "Glavnik"
 
-#: ../src/ka-main-window.c:80
+#: ../src/ka-main-window.c:83
 msgid "Start Time"
 msgstr "Vreme početka"
 
-#: ../src/ka-main-window.c:86
+#: ../src/ka-main-window.c:89
 msgid "End Time"
 msgstr "Vreme završetka"
 
 #. Translators: this is an abbreviation for forwardable
-#: ../src/ka-main-window.c:93
+#: ../src/ka-main-window.c:96
 msgid "Fwd"
 msgstr "Prosled."
 
 #. Translators: this is an abbreviation for proxiable
-#: ../src/ka-main-window.c:100
+#: ../src/ka-main-window.c:103
 msgid "Proxy"
 msgstr "Posred."
 
 #. Translators: this is an abbreviation for renewable
-#: ../src/ka-main-window.c:107
+#: ../src/ka-main-window.c:110
 msgid "Renew"
 msgstr "Obnov."
 
-#: ../src/ka-main-window.c:136
+#: ../src/ka-main-window.c:140
 msgid "Error displaying service ticket information"
 msgstr "Greška prikazivanja podataka kupona usluge"
 
-#: ../src/ka-preferences.c:296
+#: ../src/ka-preferences.c:369
 msgid "Choose Certificate"
 msgstr "Izaberite uverenje"
 
-#: ../src/ka-preferences.c:299
-msgid "_Cancel"
-msgstr "Ot_kaži"
-
-#: ../src/ka-preferences.c:300
+#: ../src/ka-preferences.c:373
 msgid "_Open"
 msgstr "Ot_vori"
 
-#: ../src/ka-preferences.c:312
+#: ../src/ka-preferences.c:385
 msgid "X509 Certificates"
 msgstr "X.509 uverenje"
 
-#: ../src/ka-preferences.c:316
+#: ../src/ka-preferences.c:389
 msgid "all files"
 msgstr "sve datoteke"
 
-#: ../src/krb5-auth-dialog.desktop.in.h:2
-msgid "Kerberos Network Authentication Dialog"
-msgstr "Prozorče mrežnog potvrđivanja identiteta Kerberosa"
+#: ../src/ka-pwdialog.c:149
+#, c-format
+msgid "%s Error"
+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“"
+
+#: ../src/ka-pwdialog.c:376
+msgid "Please enter your Kerberos password:"
+msgstr "Unesite vašu lozinku Kerberosa:"
+
+#: ../src/ka-pwdialog.c:389
+#, c-format
+msgid "Please enter the password for '%s':"
+msgstr "Unesite lozinku za „%s“:"
+
+#: ../src/ka-pwdialog.c:407
+msgid "The password you entered is invalid"
+msgstr "Lozinka koju ste uneli je neispravna"
+
+#: ../src/ka-tools.c:44
+#, c-format
+msgid ""
+"There was an error displaying help:\n"
+"%s"
+msgstr ""
+"Došlo je do greške prikazivanja pomoći:\n"
+"%s"
+
+#. Translators: add the translators of your language here
+#: ../src/ka-tools.c:84
+msgid "translator-credits"
+msgstr ""
+"  Miroslav Nikolić\n"
+"\n"
+"  http://prevod.org — prevod na srpski jezik"
 
 #: ../src/krb5-auth-dialog.appdata.xml.in.h:1
 msgid ""
@@ -1669,6 +1663,10 @@ 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.desktop.in.h:2
+msgid "Kerberos Network Authentication Dialog"
+msgstr "Prozorče mrežnog potvrđivanja identiteta Kerberosa"
+
 #: ../src/org.gnome.KrbAuthDialog.gschema.xml.h:1
 msgid "Kerberos principal"
 msgstr "Glavnik Kerberosa"