Merge lp:~noskcaj/ubuntu/vivid/gnome-keyring/3.15.90 into lp:ubuntu/vivid/gnome-keyring

[Jackson Doak]

New upstream bugfix release

 * Fix leaks [#738508]
 * Refactoring
 * Build fixes [#740190]
 * Updated translations

[Iain Lane (laney)]

Thanks.

Could you propose merges against the Vcs-Bzr in future when working on desktop packages?

I'll copy your changes manually this time. (and take the revert for bgo #744280)

[Iain Lane (laney)]

Actually it looks in this case like the branch got out of date.

I'm going to bring it in sync with reality.

Unmerged revisions

173. By Jackson Doak on 2015-02-27

New upstream bugfix release.

172. By Dimitri John Ledkov on 2014-12-29

Fix the gpg/ssh agent check syntax. Thanks to Sergey Romanov (LP:
#1400662)

=== modified file '.pc/bgz_exit_on_bus_close.patch/daemon/dbus/gkd-dbus.c'
--- .pc/bgz_exit_on_bus_close.patch/daemon/dbus/gkd-dbus.c	2014-12-06 18:47:09 +0000
+++ .pc/bgz_exit_on_bus_close.patch/daemon/dbus/gkd-dbus.c	2015-02-27 19:55:06 +0000
@@ -103,7 +103,6 @@
 
 		const gchar **env;
 		DBusMessageIter items, entry;
-		gchar **parts;
 
 		env = gkd_util_get_environment ();
 		g_return_val_if_fail (env, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
@@ -114,13 +113,17 @@
 		if (!dbus_message_iter_open_container (&args, DBUS_TYPE_ARRAY, "{ss}", &items))
 			g_return_val_if_reached (DBUS_HANDLER_RESULT_NEED_MEMORY);
 		while (*env) {
+			gchar **parts;
 			parts = g_strsplit (*env, "=", 2);
 			g_return_val_if_fail (parts && parts[0] && parts[1], DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 			if (!dbus_message_iter_open_container (&items, DBUS_TYPE_DICT_ENTRY, NULL, &entry) ||
 			    !dbus_message_iter_append_basic (&entry, DBUS_TYPE_STRING, &parts[0]) ||
 			    !dbus_message_iter_append_basic (&entry, DBUS_TYPE_STRING, &parts[1]) ||
-			    !dbus_message_iter_close_container (&items, &entry))
+			    !dbus_message_iter_close_container (&items, &entry)) {
+				g_strfreev (parts);
 				g_return_val_if_reached (DBUS_HANDLER_RESULT_NEED_MEMORY);
+			}
+			g_strfreev (parts);
 			++env;
 		}
 		if (!dbus_message_iter_close_container (&args, &items))

=== modified file 'ChangeLog'
--- ChangeLog	2014-12-06 18:47:09 +0000
+++ ChangeLog	2015-02-27 19:55:06 +0000
@@ -1,5 +1,919 @@
 # Generate automatically. Do not edit.
 
+commit bf38a2eca54dc8360bce074887a2abd4f63eaeb9
+Author: Stef Walter <[e-mail]>
+Date:   2015-02-25
+
+    Release version 3.15.90
+
+ NEWS         | 6 ++++++
+ configure.ac | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+commit a3a45e283275887947182177deb4185304593fbc
+Author: Muhammet Kara <[e-mail]>
+Date:   2014-12-06
+
+    Updated Turkish translation
+
+ po/tr.po | 255 +++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 127 insertions(+), 128 deletions(-)
+
+commit 3eb2019cfd558f3f6a4b1d3fe6c0f9dc60c6457f
+Author: Trần Ngọc Quân <[e-mail]>
+Date:   2014-11-21
+
+    Updated Vietnamese translation
+    
+    Signed-off-by: Trần Ngọc Quân <[e-mail]>
+
+ po/vi.po | 1102 +++++++++-----------------------------------------------------
+ 1 file changed, 158 insertions(+), 944 deletions(-)
+
+commit f59fb0646dedd4e730c9e8e3c090d7cd52ac5278
+Author: Ting-Wei Lan <[e-mail]>
+Date:   2014-11-16
+
+    Fix "void function should not return a value" error for clang
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=740190
+
+ daemon/login/gkd-login.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 28f04eb2bcff369ab13f3c98c00b7bcbf91594d3
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-15
+
+    asn1x: Sanitize use of asn1_set_value/asn1_take_value
+    
+    Most callers of asn1_set_value() seems to assume this function will take
+    ownership of the passed in GBytes, while it actually takes an additional
+    reference.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ egg/egg-asn1x.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 6da13bb815c3893ab305316ca3f08faaf0093953
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-15
+
+    daemon: Fix GStrv leak in DBus message handler
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ daemon/dbus/gkd-dbus.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+commit b087539a6cdd624fc4e0d6ae7de2811ab96864e6
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-21
+
+    Don't leak password data in gkm_wrap_prompt_do_credential
+    
+    Memory returned by auto_unlock_lookup_object() must be freed
+    while memory returned by gkm_wrap_prompt_request_password() must
+    not be freed. Depending on the situation, CredentialPrompt::password
+    will contain one or the other, and currently this field is never
+    freed, causing leaks when the password comes from
+    auto_unlock_lookup_object().
+    
+    This commit will always free CredentialPrompt::password when it's
+    no longer needed, and will create a copy of the returned string
+    when gkm_wrap_prompt_request_password() is called.
+    
+    This fixes (line numbers from 3.13.91-2-g45bb5be):
+    
+    ==2190== 8 bytes in 1 blocks are definitely lost in loss record 58 of 1,294
+    ==2190==    at 0x4A0645D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
+    ==2190==    by 0x5DE6DE6: g_malloc (gmem.c:97)
+    ==2190==    by 0x5E024B5: g_memdup (gstrfuncs.c:384)
+    ==2190==    by 0x41296C: gkm_template_set (gkm-attributes.c:600)
+    ==2190==    by 0x4129F0: gkm_template_set_value (gkm-attributes.c:614)
+    ==2190==    by 0x419BCD: mock_secret_C_CreateObject (mock-secret-store.c:174)
+    ==2190==    by 0x40646E: wrap_C_CreateObject (gkm-wrap-layer.c:741)
+    ==2190==    by 0x418985: find_login_keyring_item (gkm-wrap-login.c:254)
+    ==2190==    by 0x4190AF: gkm_wrap_login_lookup_secret (gkm-wrap-login.c:396)
+    ==2190==    by 0x407E8D: auto_unlock_lookup_object (gkm-wrap-prompt.c:198)
+    ==2190==    by 0x40B9B0: login_prompt_do_specific (gkm-wrap-prompt.c:1453)
+    ==2190==    by 0x40C13A: gkm_wrap_prompt_do_login (gkm-wrap-prompt.c:1591)
+    ==2190==    by 0x406384: auth_C_Login (gkm-wrap-layer.c:706)
+    ==2190==    by 0x40472A: test_specific (test-login-auto.c:156)
+    ==2190==    by 0x5E0A27A: test_case_run (gtestutils.c:2059)
+    ==2190==    by 0x5E0A602: g_test_run_suite_internal (gtestutils.c:2120)
+    ==2190==    by 0x5E0A6C4: g_test_run_suite_internal (gtestutils.c:2131)
+    ==2190==    by 0x5E0A6C4: g_test_run_suite_internal (gtestutils.c:2131)
+    ==2190==    by 0x5E0A847: g_test_run_suite (gtestutils.c:2184)
+    ==2190==    by 0x5E09551: g_test_run (gtestutils.c:1488)
+    ==2190==    by 0x410851: testing_thread (egg-testing.c:142)
+    ==2190==    by 0x5E0D2F4: g_thread_proxy (gthread.c:764)
+    ==2190==    by 0x3B7AE07F34: start_thread (pthread_create.c:309)
+    ==2190==    by 0x3B7AAF4C3C: clone (clone.S:111)
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/wrap-layer/gkm-wrap-prompt.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+commit dc5a7dc4e5690e258a90d8ddfc39e17c1f8d4938
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-21
+
+    Don't leak password in login_prompt_do_{specific, user)
+    
+    login_prompt_do_specific() and login_prompt_do_user() both
+    set GkmWrapPrompt::prompt_data to either memory which must be freed
+    with egg_secure_memory_strfree (through a call to
+    auto_unlock_lookup_*) or to const memory which must not be freed
+    (through a call to gkm_wrap_prompt_request_password).
+    
+    These methods currently assume the password memory does not need
+    to be freed, which leads to this leak in test-login-auto (line numbers
+    from 3.13.91-2-g45bb5be):
+    
+    ==2190== 5 bytes in 1 blocks are definitely lost in loss record 17 of 1,294
+    ==2190==    at 0x40F8E4: egg_secure_alloc_full (egg-secure-memory.c:1056)
+    ==2190==    by 0x417F5E: egg_secure_alloc (gkm-wrap-login.c:42)
+    ==2190==    by 0x419157: gkm_wrap_login_lookup_secret (gkm-wrap-login.c:409)
+    ==2190==    by 0x407E8D: auto_unlock_lookup_object (gkm-wrap-prompt.c:198)
+    ==2190==    by 0x40B9B0: login_prompt_do_specific (gkm-wrap-prompt.c:1453)
+    ==2190==    by 0x40C13A: gkm_wrap_prompt_do_login (gkm-wrap-prompt.c:1591)
+    ==2190==    by 0x406384: auth_C_Login (gkm-wrap-layer.c:706)
+    ==2190==    by 0x40472A: test_specific (test-login-auto.c:156)
+    ==2190==    by 0x5E0A27A: test_case_run (gtestutils.c:2059)
+    ==2190==    by 0x5E0A602: g_test_run_suite_internal (gtestutils.c:2120)
+    ==2190==    by 0x5E0A6C4: g_test_run_suite_internal (gtestutils.c:2131)
+    ==2190==    by 0x5E0A6C4: g_test_run_suite_internal (gtestutils.c:2131)
+    ==2190==    by 0x5E0A847: g_test_run_suite (gtestutils.c:2184)
+    ==2190==    by 0x5E09551: g_test_run (gtestutils.c:1488)
+    ==2190==    by 0x410851: testing_thread (egg-testing.c:142)
+    ==2190==    by 0x5E0D2F4: g_thread_proxy (gthread.c:764)
+    ==2190==    by 0x3B7AE07F34: start_thread (pthread_create.c:309)
+    ==2190==    by 0x3B7AAF4C3C: clone (clone.S:111)
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/wrap-layer/gkm-wrap-prompt.c | 62 ++++++++++++++++++++++++++-----------
+ 1 file changed, 44 insertions(+), 18 deletions(-)
+
+commit abf3473a9a14784a76911ef35c0916d462d55402
+Author: Stef Walter <[e-mail]>
+Date:   2014-10-26
+
+    gpg-agent: Use common code for storing/retrieving passwords
+
+ daemon/gpg-agent/gkd-gpg-agent-ops.c | 269 +++--------------------------------
+ 1 file changed, 21 insertions(+), 248 deletions(-)
+
+commit 354f9887eef1c2c6144b904739ca0230bc2f2a4e
+Author: Stef Walter <[e-mail]>
+Date:   2014-10-26
+
+    login: Factor out the code for storing/retrieving login keyring passwords
+    
+    This was in the gpg-agent, and want to use it in our ssh-agent wrapper
+
+ daemon/login/Makefile.am |   1 +
+ daemon/login/gkd-login.c | 300 +++++++++++++++++++++++++++++++++++++++++++++++
+ daemon/login/gkd-login.h |  20 ++++
+ 3 files changed, 321 insertions(+)
+
+commit d9df0a179fbfae82f8cec20cf46e8b9f03c044ba
+Author: Stef Walter <[e-mail]>
+Date:   2014-10-26
+
+    gpg-agent: No longer build the testing standalone agent
+    
+    This just caused more unneccessary code that we'd never use.
+
+ daemon/gpg-agent/Makefile.am | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+commit ea36fd9182c143348851be2053bce9b6da052bc8
+Author: Baurzhan Muftakhidinov <[e-mail]>
+Date:   2014-10-28
+
+    Added Kazakh translation
+
+ po/LINGUAS |   1 +
+ po/kk.po   | 572 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 573 insertions(+)
+
+commit 082a2fe3278c37b9899c23ebac003791a8999ea5
+Author: Stef Walter <[e-mail]>
+Date:   2014-10-25
+
+    Ignore vim swp temporary files
+
+ .gitignore | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 39aeef6f368e4d8517f19b83c33d55b9cc87f44f
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-14
+
+    GkdGpgAgent: Unref GIOChannel when no longer needed
+    
+    This fixes a memory leak reported by valgrind on daemon shutdown
+    (tested by starting a new daemon instance with --replace).
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ daemon/gpg-agent/gkd-gpg-agent.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 3db6f3bbbd13d6eec29cf96f103975f793b24e4e
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-14
+
+    Free GkdSecretService::alias_directory in finalize()
+    
+    This fixes a memory leak reported by valgrind on daemon shutdown
+    (tested by starting a new daemon instance with --replace).
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ daemon/dbus/gkd-secret-service.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit ddcdccbf98ba71547c6494db07b3ece505ec769b
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-13
+
+    GkmMock: Fix handling of CKA_G_CREDENTIAL_TEMPLATE attributes
+    
+    These are special as their value is an array of CK_ATTRIBUTE pointing to
+    allocated memory. Moreover, when gkm_mock_C_SetAttributeValue() is
+    called, this memory is owned by the caller, so it needs to be duplicated
+    as the caller may free it before GkmMock no longer needs it.
+    
+    We also need to make sure this memory we just duplicated is correctly
+    freed when no longer needed.
+    
+    This is achieved by introducing an additional global variable,
+    the_credential_template. This is similar to how this type of attributes
+    is handled in GkmSecretCollection.
+    
+    Without this, running test-login-auto in valgrind causes invalid reads:
+    
+    ==5954== Invalid read of size 1
+    ==5954==    at 0x4123D4: gkm_attributes_find_boolean (gkm-attributes.c:503)
+    ==5954==    by 0x408C00: set_unlock_options_on_prompt (gkm-wrap-prompt.c:520)
+    ==5954==    by 0x40A3E8: gkm_wrap_prompt_do_credential (gkm-wrap-prompt.c:1055)
+    ==5954==    by 0x40641C: auth_C_CreateObject (gkm-wrap-layer.c:764)
+    ==5954==    by 0x404D7B: test_unlock_keyring (test-login-auto.c:243)
+    ==5954==    by 0x5E04A8B: test_case_run (gtestutils.c:2059)
+    ==5954==    by 0x5E04E2D: g_test_run_suite_internal (gtestutils.c:2120)
+    ==5954==    by 0x5E04EEF: g_test_run_suite_internal (gtestutils.c:2131)
+    ==5954==    by 0x5E04EEF: g_test_run_suite_internal (gtestutils.c:2131)
+    ==5954==    by 0x5E0506F: g_test_run_suite (gtestutils.c:2184)
+    ==5954==    by 0x5E03D5C: g_test_run (gtestutils.c:1488)
+    ==5954==    by 0x410725: testing_thread (egg-testing.c:142)
+    ==5954==    by 0x5E07B29: g_thread_proxy (gthread.c:764)
+    ==5954==    by 0x3899207529: start_thread (pthread_create.c:310)
+    ==5954==    by 0x3898F0077C: clone (clone.S:109)
+    ==5954==  Address 0x85bad90 is 0 bytes inside a block of size 1 free'd
+    ==5954==    at 0x4A07CE9: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
+    ==5954==    by 0x5DE1A0D: g_free (gmem.c:190)
+    ==5954==    by 0x409E54: gkm_wrap_prompt_finalize (gkm-wrap-prompt.c:933)
+    ==5954==    by 0x590293A: g_object_unref (gobject.c:3170)
+    ==5954==    by 0x40644A: auth_C_CreateObject (gkm-wrap-layer.c:771)
+    ==5954==    by 0x404CD5: test_unlock_keyring (test-login-auto.c:234)
+    ==5954==    by 0x5E04A8B: test_case_run (gtestutils.c:2059)
+    ==5954==    by 0x5E04E2D: g_test_run_suite_internal (gtestutils.c:2120)
+    ==5954==    by 0x5E04EEF: g_test_run_suite_internal (gtestutils.c:2131)
+    ==5954==    by 0x5E04EEF: g_test_run_suite_internal (gtestutils.c:2131)
+    ==5954==    by 0x5E0506F: g_test_run_suite (gtestutils.c:2184)
+    ==5954==    by 0x5E03D5C: g_test_run (gtestutils.c:1488)
+    ==5954==    by 0x410725: testing_thread (egg-testing.c:142)
+    ==5954==    by 0x5E07B29: g_thread_proxy (gthread.c:764)
+    ==5954==    by 0x3899207529: start_thread (pthread_create.c:310)
+    ==5954==    by 0x3898F0077C: clone (clone.S:109)
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gkm/gkm-mock.c | 27 +++++++++++++++++++++++++--
+ 1 file changed, 25 insertions(+), 2 deletions(-)
+
+commit 87f82c227694279d7e6ad26ca90112835a69c7c5
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    test-spawn: Fix leaks of EchoData content
+    
+    EchoData::error and EchoData::output must be freed after
+    use.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ egg/test-spawn.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit 0db2253d64b5607bf20e4e17060de81450e91797
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-22
+
+    xdg: Fix ref leak in remove_assertion_from_trust()
+    
+    When a transaction is used, remove_assertion_from_trust() will
+    steal the assertion and its key from the 'assertions' hash table.
+    The stolen assertion will then be added to the transaction and be
+    unreferenced later, but the key must be unref'ed as the hash table
+    owned a reference on it.
+    
+    This fixes:
+    
+    ==9337== 104 (40 direct, 64 indirect) bytes in 1 blocks are definitely lost in loss record 614 of 678
+    ==9337==    at 0x4A0645D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
+    ==9337==    by 0x4EEADE6: g_malloc (gmem.c:97)
+    ==9337==    by 0x4F03A22: g_slice_alloc (gslice.c:1007)
+    ==9337==    by 0x4EB6954: g_bytes_new_with_free_func (gbytes.c:183)
+    ==9337==    by 0x4EB68D5: g_bytes_new_take (gbytes.c:126)
+    ==9337==    by 0x4116D4: create_assertion_key (gkm-xdg-trust.c:355)
+    ==9337==    by 0x411755: lookup_or_create_assertion_key (gkm-xdg-trust.c:371)
+    ==9337==    by 0x41312C: gkm_xdg_trust_replace_assertion (gkm-xdg-trust.c:874)
+    ==9337==    by 0x413B62: factory_create_assertion (gkm-xdg-assertion.c:181)
+    ==9337==    by 0x4338A3: gkm_session_create_object_for_factory (gkm-session.c:778)
+    ==9337==    by 0x433A5B: gkm_session_create_object_for_attributes (gkm-session.c:820)
+    ==9337==    by 0x434222: gkm_session_C_CreateObject (gkm-session.c:954)
+    ==9337==    by 0x40A1D0: test_create_assertion_twice (test-xdg-trust.c:497)
+    ==9337==    by 0x4F0E27A: test_case_run (gtestutils.c:2059)
+    ==9337==    by 0x4F0E602: g_test_run_suite_internal (gtestutils.c:2120)
+    ==9337==    by 0x4F0E6C4: g_test_run_suite_internal (gtestutils.c:2131)
+    ==9337==    by 0x4F0E6C4: g_test_run_suite_internal (gtestutils.c:2131)
+    ==9337==    by 0x4F0E847: g_test_run_suite (gtestutils.c:2184)
+    ==9337==    by 0x4F0D551: g_test_run (gtestutils.c:1488)
+    ==9337==    by 0x4516AD: testing_thread (egg-testing.c:142)
+    ==9337==    by 0x4F112F4: g_thread_proxy (gthread.c:764)
+    ==9337==    by 0x3B7AE07F34: start_thread (pthread_create.c:309)
+    ==9337==    by 0x3B7AAF4C3C: clone (clone.S:111)
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/xdg-store/gkm-xdg-trust.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 37c493c086f1721d6dea77bac462e60dc23096df
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-22
+
+    xdg: Remove wrong unref in gkm_xdg_trust_replace_assertion
+    
+    Callers of lookup_or_create_assertion_key() don't own a reference
+    on the returned GBytes so it should not be unref'fed before exiting
+    gkm_xdg_trust_replace_assertion.
+    This solves the following errors from valgrind when running test-xdg-trust
+    
+    ==15477==
+    ==15477== Thread 2 testing:
+    ==15477== Invalid read of size 4
+    ==15477==    at 0x4EB6B75: g_bytes_unref (gbytes.c:306)
+    ==15477==    by 0x4EC2692: g_datalist_clear (gdataset.c:273)
+    ==15477==    by 0x4C284A3: g_object_finalize (gobject.c:1033)
+    ==15477==    by 0x42B35E: gkm_object_finalize (gkm-object.c:448)
+    ==15477==    by 0x414134: gkm_assertion_finalize (gkm-assertion.c:134)
+    ==15477==    by 0x4C2D256: g_object_unref (gobject.c:3170)
+    ==15477==    by 0x43B9C7: gkm_util_dispose_unref (gkm-util.c:137)
+    ==15477==    by 0x4ECEBD1: g_hash_table_remove_all_nodes (ghash.c:503)
+    ==15477==    by 0x4ECFC02: g_hash_table_remove_all (ghash.c:1371)
+    ==15477==    by 0x431DBB: gkm_session_dispose (gkm-session.c:409)
+    ==15477==    by 0x4C2D131: g_object_unref (gobject.c:3133)
+    ==15477==    by 0x425391: apartment_free (gkm-module.c:241)
+    ==15477==    by 0x4ECEBD1: g_hash_table_remove_all_nodes (ghash.c:503)
+    ==15477==    by 0x4ECFC02: g_hash_table_remove_all (ghash.c:1371)
+    ==15477==    by 0x4267F9: gkm_module_dispose (gkm-module.c:633)
+    ==15477==    by 0x4107D3: gkm_xdg_module_dispose (gkm-xdg-module.c:553)
+    ==15477==    by 0x4C28648: g_object_run_dispose (gobject.c:1076)
+    ==15477==    by 0x40CCDD: gkm_C_Finalize (gkm-module-ep.h:102)
+    ==15477==    by 0x40C7F0: mock_xdg_module_leave_and_finalize (mock-xdg-module.c:151)
+    ==15477==    by 0x408585: teardown (test-xdg-trust.c:138)
+    ==15477==    by 0x4F0E2FE: test_case_run (gtestutils.c:2069)
+    ==15477==    by 0x4F0E602: g_test_run_suite_internal (gtestutils.c:2120)
+    ==15477==    by 0x4F0E6C4: g_test_run_suite_internal (gtestutils.c:2131)
+    ==15477==    by 0x4F0E6C4: g_test_run_suite_internal (gtestutils.c:2131)
+    ==15477==    by 0x4F0E847: g_test_run_suite (gtestutils.c:2184)
+    ==15477==    by 0x4F0D551: g_test_run (gtestutils.c:1488)
+    ==15477==    by 0x4516B9: testing_thread (egg-testing.c:142)
+    ==15477==    by 0x4F112F4: g_thread_proxy (gthread.c:764)
+    ==15477==    by 0x3B7AE07F34: start_thread (pthread_create.c:309)
+    ==15477==    by 0x3B7AAF4C3C: clone (clone.S:111)
+    ==15477==  Address 0x52b6100 is 16 bytes inside a block of size 40 free'd
+    ==15477==    at 0x4A07577: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
+    ==15477==    by 0x4EEAF5F: g_free (gmem.c:190)
+    ==15477==    by 0x4F03C59: g_slice_free1 (gslice.c:1112)
+    ==15477==    by 0x4EB6BB8: g_bytes_unref (gbytes.c:310)
+    ==15477==    by 0x4ECEBB3: g_hash_table_remove_all_nodes (ghash.c:500)
+    ==15477==    by 0x4ECFC02: g_hash_table_remove_all (ghash.c:1371)
+    ==15477==    by 0x4ECF7C4: g_hash_table_destroy (ghash.c:1067)
+    ==15477==    by 0x4127E9: gkm_xdg_trust_finalize (gkm-xdg-trust.c:706)
+    ==15477==    by 0x4C2D256: g_object_unref (gobject.c:3170)
+    ==15477==    by 0x43B9C7: gkm_util_dispose_unref (gkm-util.c:137)
+    ==15477==    by 0x4ECEBD1: g_hash_table_remove_all_nodes (ghash.c:503)
+    ==15477==    by 0x4ECFC02: g_hash_table_remove_all (ghash.c:1371)
+    ==15477==    by 0x431DBB: gkm_session_dispose (gkm-session.c:409)
+    ==15477==    by 0x4C2D131: g_object_unref (gobject.c:3133)
+    ==15477==    by 0x425391: apartment_free (gkm-module.c:241)
+    ==15477==    by 0x4ECEBD1: g_hash_table_remove_all_nodes (ghash.c:503)
+    ==15477==    by 0x4ECFC02: g_hash_table_remove_all (ghash.c:1371)
+    ==15477==    by 0x4267F9: gkm_module_dispose (gkm-module.c:633)
+    ==15477==    by 0x4107D3: gkm_xdg_module_dispose (gkm-xdg-module.c:553)
+    ==15477==    by 0x4C28648: g_object_run_dispose (gobject.c:1076)
+    ==15477==    by 0x40CCDD: gkm_C_Finalize (gkm-module-ep.h:102)
+    ==15477==    by 0x40C7F0: mock_xdg_module_leave_and_finalize (mock-xdg-module.c:151)
+    ==15477==    by 0x408585: teardown (test-xdg-trust.c:138)
+    ==15477==    by 0x4F0E2FE: test_case_run (gtestutils.c:2069)
+    ==15477==    by 0x4F0E602: g_test_run_suite_internal (gtestutils.c:2120)
+    ==15477==    by 0x4F0E6C4: g_test_run_suite_internal (gtestutils.c:2131)
+    ==15477==    by 0x4F0E6C4: g_test_run_suite_internal (gtestutils.c:2131)
+    ==15477==    by 0x4F0E847: g_test_run_suite (gtestutils.c:2184)
+    ==15477==    by 0x4F0D551: g_test_run (gtestutils.c:1488)
+    ==15477==    by 0x4516B9: testing_thread (egg-testing.c:142)
+    ==15477==    by 0x4F112F4: g_thread_proxy (gthread.c:764)
+    ==15477==    by 0x3B7AE07F34: start_thread (pthread_create.c:309)
+    ==15477==    by 0x3B7AAF4C3C: clone (clone.S:111)
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/xdg-store/gkm-xdg-trust.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit f2e759970c1a3a42378528a15166221715493288
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-21
+
+    test-xdg-trust: Fix GChecksum leaks
+    
+    'md' is created using g_checksum_new() so it must be destroyed
+    with g_checksum_free() after use.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gkm/gkm-attributes.c       | 1 +
+ pkcs11/xdg-store/test-xdg-trust.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+commit a88f4fcf255495ee575b4b7b94574c3ca0b66ca1
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-21
+
+    Unref GkmXdgTrust::bytes in finalize()
+    
+    This will cause leaks otherwise, for example in test-xdg-module.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/xdg-store/gkm-xdg-trust.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 621a86e8b1b14a387cf1dd895005007570c3d2c3
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-21
+
+    test-xdg-module: Fix memory leak
+    
+    Memory from g_file_get_contents() was never freed.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/xdg-store/test-xdg-module.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit bbb96835cc4120d6c9f0d7bf272f6eb386a07468
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-21
+
+    xdg: Don't leak ref in lookup_or_create_assertion_key()
+    
+    When lookup_or_create_assertion_key() creates a new assertion key,
+    it own a reference on the GBytes created by create_assertion_key()
+    and it will then take an extra ref on it when associating it with a
+    GkmAssertion instance.
+    
+    This will cause a leak of the memory returned by create_assertion_key()
+    as one of these references will never be dropped.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/xdg-store/gkm-xdg-trust.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit bc17247fdd1fa843560ecebb4f20a10460df0d63
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-21
+
+    Fix leak in gkm_mock_C_SetPIN()
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gkm/gkm-mock.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 670fe30c2dfe7accc738c8def6c1ccf047c944b6
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    gkm-xdg-assertion: Fix leak in factory_create_assertion()
+    
+    'purpose' and 'peer' were allocated through gkm_attributes_find_string()
+    and must thus be freed after use.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/xdg-store/gkm-xdg-assertion.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit ca2b73954d497ea36b94b547649a08dd85ec38e1
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    Fix leak in mock_secret_C_CreateObject
+    
+    'template' is created with gkm_template_new() so it must be freed
+    using gkm_template_free().
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/wrap-layer/mock-secret-store.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 165f0e3210e32538c847be91896736c17a1f6ad6
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    gkm-secret-textual: Fix leak in generate_attribute()
+    
+    The GList returned by gkm_secret_fields_get_names() must be
+    freed with g_list_free after use as this is created using
+    g_hash_table_get_keys().
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/secret-store/gkm-secret-textual.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 750047bc77edc730e76fc536ce17151b52ae22da
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    gkm-secret-search: Fix leak in factory_create_search()
+    
+    gkm_attribute_get_string() returns a newly allocated string which must
+    be freed when no longer useful.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/secret-store/gkm-secret-search.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit a1984261cb2aabf20d2014a987e2adfbfbae7fc1
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    gkm-gnome2-storage: Unref GkmGnome2Storage::login in dispose()
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gnome2-store/gkm-gnome2-storage.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit bf96feaff541668ead5438ee074c4318165a3962
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    secret-store/test*: Don't leak secret data memory
+    
+    Both test-secret-binary and test-secret-textual call
+    g_file_get_contents() but never free the returned data, causing a memory
+    leak.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/secret-store/test-secret-binary.c  | 1 +
+ pkcs11/secret-store/test-secret-textual.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+commit 9421bf589095380286bed90bca67f6ae2746ce0b
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    test-import: Don't leak args.pReserved
+    
+    It's allocated with g_strdup_printf and must thus be freed after use.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gnome2-store/test-import.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit c2870de15ba639b6a02916a89be07274c2b5895b
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    egg-hkdf: Fix gcry_md_ht_t leak in egg_hkdf_perform
+    
+    The 'md2' gcry_md_ht_t variable is opened with gcry_md_open() in that
+    method but is never closed, which causes a leak.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ egg/egg-hkdf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 1581f4a33e350de62cf98bec0530934dcf2a0272
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    egg-asn1x: Fix memory leak in egg_asn1x_set_any_raw()
+    
+    In error cases, the Atlv variable 'tlv' which was created in this
+    function is not going to be used, so we must free it before returning.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ egg/egg-asn1x.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 17b429de6d2d911fcfac3fbc042aa5579a3a4535
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    test-sexp: Fix 2 leaks
+    
+    gcry_sexp_t objects created with gkm_sexp_parse_key() must be freed with
+    gcry_sexp_release(), and gcry_mpi_t objects created with
+    gkm_sexp_extract_mpi() must be freed with gcry_mpi_release() when no
+    longer used.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gkm/test-sexp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 33793e57c557830cda36af68376f5dfd2130c073
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    test-secret: Don't leak new secrets in test_equal()
+    
+    Secrets created with gkm_secret_new* must be unref'fed when no longer
+    used.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gkm/test-secret.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 75c1fb8b8e3eb0df794bd80ed883fdc16a865664
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    test-pam: Fix GError leak in error case
+    
+    When g_file_get_contents() fails and sets an error, it must be freed.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pam/test-pam.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit dbc6af0ea986a4840e6a8a06d632435332c6d2a4
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    test-padding: Don't leak egg_padding_pkcs1_pad_02 return value
+    
+    egg_padding_pkcs1_pad_02 returns newly allocated data which must be
+    g_free'ed after use.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ egg/test-padding.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 610a177931675a08a13681d6741a1d18baaa92ee
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    test-asn1: Don't leak 'asn' in test_create_quark()
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ egg/test-asn1.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 1e18f347a1a3444b3fc7126af087d0c90a791e57
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    test-startup: Use g_strfreev to free GStrv variable
+    
+    gkd_test_launch_daemon returns a "transfer full" GStrv, so it must be
+    freed with g_strfreev after use.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ daemon/test-startup.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 6c2d07a4faea639ed2b2bcf1815fdb5cbfa4945e
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-17
+
+    gkm-gnome2-file: Free keys to 'entries' hash tables
+    
+    The keys to the 'publics' and 'privates' hash tables are strdup'ed
+    strings, but these strings are never freed. This commit adds a free
+    function for hash table keys to the g_hash_table_new_full call.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gnome2-store/gkm-gnome2-file.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 0fc832aa65e2d125459c9fb43c4d3ba4697270d6
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-17
+
+    test-data-der: Fix various memory leaks
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gkm/test-data-der.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+commit 298d910cfe2e468ad0005646e8a00b5fc8116e10
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-17
+
+    test-data-asn1: Fix memory leaks in test_asn1_integers
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gkm/test-data-asn1.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit c5083ba0216b15e8f9ed842b7097e7fa6c60c25b
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-17
+
+    gkm-data-asn1: Unref buffer we got from egg_asn1x_get_integer_as_raw()
+    
+    Otherwise we will be leaking a reference to that buffer, and it will
+    never get destroyed. This showed up as a memory leaked in test-data-der.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gkm/gkm-data-asn1.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 326a94543c5cc6c44d3fd9e1b7fd6eb11a2ea998
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-17
+
+    egg/test-dn: Don't leak GBytes created in test_dn_value()
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ egg/test-dn.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 8ea8329cc09e263d9628e791e0f5a464bde63413
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-17
+
+    egg-cleanup: Don't leak 'cleanup' on unregister
+    
+    When unregistering a cleanup instance, the memory allocated for the cleanup
+    was not freed causing a memory leak.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ egg/egg-cleanup.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 9af2db3f41e713c02e36dc71f0d6295db7d9e408
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-17
+
+    test-dbus-items: Fix memory leak
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ daemon/dbus/test-dbus-items.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 0c9c4a549e770e89e51d5f39995fdfc8c1af71ec
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-15
+
+    Free GkmSecretItem::schema in ::finalize()
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/secret-store/gkm-secret-item.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 04129e8d2c1cb8a0f5d6944d4bb7fa45f7171a2a
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-15
+
+    gkm-gnome2-file: Fix leaks in create_cipher()
+    
+    'key' and 'iv' were allocated before calling
+    egg_symkey_generate_simple() but this function allocates the memory
+    needed for the 'key' and 'iv' return value, so the memory which was
+    allocated in create_cipher() is lost and leaked.
+    This also uses egg_secure_memory_free() to free 'key' memory as
+    egg_symkey_generate_simple() allocates it with egg_secure_alloc().
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gnome2-store/gkm-gnome2-file.c | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+commit 5a98866f4b7c89451c95e8d559e8f2021c5e1456
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-15
+
+    gkm-gnome2-file: Fix leak in validate_buffer()
+    
+    'check' is allocated in this function but never freed.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gnome2-store/gkm-gnome2-file.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+commit 24ff22e04c86885aa4f7f877d612c94e2e2d8f6d
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-15
+
+    Unref GkmCredential::secret in ::dispose
+    
+    This fixes a memory leak.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ pkcs11/gkm/gkm-credential.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 9bfe73731316389a9975fd440992afa914070467
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-14
+
+    ssh-agent: Fix leak in op_request_identities
+    
+    The object returned by gck_enumerator_next() must be unref'ed.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ daemon/ssh-agent/gkd-ssh-agent-ops.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+commit f81fa15dcbbc3a7ce3e8be9a229e13a0678a606b
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    ssh-agent: Fix leak in op_v1_request_identities
+    
+    The object returned by gck_enumerator_next() must be unref'ed
+    as this method is "transfer full".
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ daemon/ssh-agent/gkd-ssh-agent-ops.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit d177a8b5353f3156ab504f39c20753d6786e5e4d
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-09-15
+
+    ssh-agent: Fix leak in search_keys_like_attributes()
+    
+    gck_enumerator_next() return value must be unref'fed as it's transfer
+    full.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ daemon/ssh-agent/gkd-ssh-agent-ops.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 04b9de9fd806598bb49e6b9d49d2697156f6f39d
+Author: Christophe Fergeau <[e-mail]>
+Date:   2014-10-01
+
+    ssh-agent: Fix leak in remove_by_public_key()
+    
+    gck_attributes_find_string() returns a newly allocated string, so it
+    must be g_free'ed after use.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=738508
+
+ daemon/ssh-agent/gkd-ssh-agent-ops.c | 1 +
+ 1 file changed, 1 insertion(+)
+
 commit 32900996ac1d913bbae6e378a0a974d207d81c8e
 Author: Stef Walter <[e-mail]>
 Date:   2014-09-23

=== modified file 'Makefile.in'
--- Makefile.in	2014-12-06 18:47:09 +0000
+++ Makefile.in	2015-02-27 19:55:06 +0000
@@ -116,9 +116,8 @@
 	$(am__EXEEXT_10) $(am__EXEEXT_12)
 noinst_PROGRAMS = $(check_PROGRAMS) frob-control-change$(EXEEXT) \
 	frob-control-init$(EXEEXT) frob-control-unlock$(EXEEXT) \
-	frob-control-quit$(EXEEXT) gkd-gpg-agent-standalone$(EXEEXT) \
-	gkd-ssh-agent-standalone$(EXEEXT) frob-gnome2-file$(EXEEXT) \
-	gkm-rpc-daemon-standalone$(EXEEXT) \
+	frob-control-quit$(EXEEXT) gkd-ssh-agent-standalone$(EXEEXT) \
+	frob-gnome2-file$(EXEEXT) gkm-rpc-daemon-standalone$(EXEEXT) \
 	dump-keyring0-format$(EXEEXT) frob-trust-file$(EXEEXT) \
 	dump-trust-file$(EXEEXT)
 TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
@@ -659,15 +658,6 @@
 	pkcs11/xdg-store/frob-trust-file.$(OBJEXT)
 frob_trust_file_OBJECTS = $(am_frob_trust_file_OBJECTS)
 frob_trust_file_DEPENDENCIES = $(am__DEPENDENCIES_3)
-am_gkd_gpg_agent_standalone_OBJECTS = daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.$(OBJEXT)
-gkd_gpg_agent_standalone_OBJECTS =  \
-	$(am_gkd_gpg_agent_standalone_OBJECTS)
-gkd_gpg_agent_standalone_DEPENDENCIES = libgkd-gpg-agent.la libegg.la \
-	$(am__DEPENDENCIES_1)
-gkd_gpg_agent_standalone_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(gkd_gpg_agent_standalone_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
 am_gkd_ssh_agent_standalone_OBJECTS = daemon/ssh-agent/gkd_ssh_agent_standalone-gkd-ssh-agent-standalone.$(OBJEXT)
 gkd_ssh_agent_standalone_OBJECTS =  \
 	$(am_gkd_ssh_agent_standalone_OBJECTS)
@@ -1052,8 +1042,7 @@
 	$(dump_trust_file_SOURCES) $(frob_control_change_SOURCES) \
 	$(frob_control_init_SOURCES) $(frob_control_quit_SOURCES) \
 	$(frob_control_unlock_SOURCES) $(frob_gnome2_file_SOURCES) \
-	$(frob_trust_file_SOURCES) $(gkd_gpg_agent_standalone_SOURCES) \
-	$(gkd_ssh_agent_standalone_SOURCES) \
+	$(frob_trust_file_SOURCES) $(gkd_ssh_agent_standalone_SOURCES) \
 	$(gkm_rpc_daemon_standalone_SOURCES) \
 	$(gnome_keyring_@GKR_MAJOR@_SOURCES) \
 	$(gnome_keyring_daemon_SOURCES) $(test_armor_SOURCES) \
@@ -1118,7 +1107,6 @@
 	$(frob_control_change_SOURCES) $(frob_control_init_SOURCES) \
 	$(frob_control_quit_SOURCES) $(frob_control_unlock_SOURCES) \
 	$(frob_gnome2_file_SOURCES) $(frob_trust_file_SOURCES) \
-	$(gkd_gpg_agent_standalone_SOURCES) \
 	$(gkd_ssh_agent_standalone_SOURCES) \
 	$(gkm_rpc_daemon_standalone_SOURCES) \
 	$(gnome_keyring_@GKR_MAJOR@_SOURCES) \
@@ -2095,17 +2083,6 @@
 	$(GCK_CFLAGS) \
 	$(GCR_CFLAGS)
 
-gkd_gpg_agent_standalone_SOURCES = \
-	daemon/gpg-agent/gkd-gpg-agent-standalone.c
-
-gkd_gpg_agent_standalone_CFLAGS = \
-	$(GCK_CFLAGS)
-
-gkd_gpg_agent_standalone_LDADD = \
-	libgkd-gpg-agent.la \
-	libegg.la \
-	$(DAEMON_LIBS)
-
 libgkd_login_la_SOURCES = \
 	daemon/login/gkd-login.c \
 	daemon/login/gkd-login.h \
@@ -2113,6 +2090,7 @@
 
 libgkd_login_la_CFLAGS = \
 	$(GCK_CFLAGS) \
+	$(GCR_CFLAGS) \
 	$(GOBJECT_CFLAGS)
 
 libgkd_login_la_LIBADD = \
@@ -3735,13 +3713,6 @@
 frob-trust-file$(EXEEXT): $(frob_trust_file_OBJECTS) $(frob_trust_file_DEPENDENCIES) $(EXTRA_frob_trust_file_DEPENDENCIES) 
 	@rm -f frob-trust-file$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(frob_trust_file_OBJECTS) $(frob_trust_file_LDADD) $(LIBS)
-daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.$(OBJEXT):  \
-	daemon/gpg-agent/$(am__dirstamp) \
-	daemon/gpg-agent/$(DEPDIR)/$(am__dirstamp)
-
-gkd-gpg-agent-standalone$(EXEEXT): $(gkd_gpg_agent_standalone_OBJECTS) $(gkd_gpg_agent_standalone_DEPENDENCIES) $(EXTRA_gkd_gpg_agent_standalone_DEPENDENCIES) 
-	@rm -f gkd-gpg-agent-standalone$(EXEEXT)
-	$(AM_V_CCLD)$(gkd_gpg_agent_standalone_LINK) $(gkd_gpg_agent_standalone_OBJECTS) $(gkd_gpg_agent_standalone_LDADD) $(LIBS)
 daemon/ssh-agent/gkd_ssh_agent_standalone-gkd-ssh-agent-standalone.$(OBJEXT):  \
 	daemon/ssh-agent/$(am__dirstamp) \
 	daemon/ssh-agent/$(DEPDIR)/$(am__dirstamp)
@@ -4271,7 +4242,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/dbus/$(DEPDIR)/test-service.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/dbus/$(DEPDIR)/test_dbus_signals-test-dbus-signals.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/dbus/$(DEPDIR)/test_dbus_util-test-dbus-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@daemon/gpg-agent/$(DEPDIR)/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/gpg-agent/$(DEPDIR)/libgkd_gpg_agent_la-gkd-gpg-agent-ops.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/gpg-agent/$(DEPDIR)/libgkd_gpg_agent_la-gkd-gpg-agent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@daemon/login/$(DEPDIR)/libgkd_login_la-gkd-login.Plo@am__quote@
@@ -5340,20 +5310,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_gnome_keyring_la_CFLAGS) $(CFLAGS) -c -o pam/pam_gnome_keyring_la-gkr-pam-stubs.lo `test -f 'pam/gkr-pam-stubs.c' || echo '$(srcdir)/'`pam/gkr-pam-stubs.c
 
-daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.o: daemon/gpg-agent/gkd-gpg-agent-standalone.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gkd_gpg_agent_standalone_CFLAGS) $(CFLAGS) -MT daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.o -MD -MP -MF daemon/gpg-agent/$(DEPDIR)/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.Tpo -c -o daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.o `test -f 'daemon/gpg-agent/gkd-gpg-agent-standalone.c' || echo '$(srcdir)/'`daemon/gpg-agent/gkd-gpg-agent-standalone.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) daemon/gpg-agent/$(DEPDIR)/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.Tpo daemon/gpg-agent/$(DEPDIR)/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='daemon/gpg-agent/gkd-gpg-agent-standalone.c' object='daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gkd_gpg_agent_standalone_CFLAGS) $(CFLAGS) -c -o daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.o `test -f 'daemon/gpg-agent/gkd-gpg-agent-standalone.c' || echo '$(srcdir)/'`daemon/gpg-agent/gkd-gpg-agent-standalone.c
-
-daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.obj: daemon/gpg-agent/gkd-gpg-agent-standalone.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gkd_gpg_agent_standalone_CFLAGS) $(CFLAGS) -MT daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.obj -MD -MP -MF daemon/gpg-agent/$(DEPDIR)/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.Tpo -c -o daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.obj `if test -f 'daemon/gpg-agent/gkd-gpg-agent-standalone.c'; then $(CYGPATH_W) 'daemon/gpg-agent/gkd-gpg-agent-standalone.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gpg-agent/gkd-gpg-agent-standalone.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) daemon/gpg-agent/$(DEPDIR)/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.Tpo daemon/gpg-agent/$(DEPDIR)/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='daemon/gpg-agent/gkd-gpg-agent-standalone.c' object='daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gkd_gpg_agent_standalone_CFLAGS) $(CFLAGS) -c -o daemon/gpg-agent/gkd_gpg_agent_standalone-gkd-gpg-agent-standalone.obj `if test -f 'daemon/gpg-agent/gkd-gpg-agent-standalone.c'; then $(CYGPATH_W) 'daemon/gpg-agent/gkd-gpg-agent-standalone.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gpg-agent/gkd-gpg-agent-standalone.c'; fi`
-
 daemon/ssh-agent/gkd_ssh_agent_standalone-gkd-ssh-agent-standalone.o: daemon/ssh-agent/gkd-ssh-agent-standalone.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gkd_ssh_agent_standalone_CFLAGS) $(CFLAGS) -MT daemon/ssh-agent/gkd_ssh_agent_standalone-gkd-ssh-agent-standalone.o -MD -MP -MF daemon/ssh-agent/$(DEPDIR)/gkd_ssh_agent_standalone-gkd-ssh-agent-standalone.Tpo -c -o daemon/ssh-agent/gkd_ssh_agent_standalone-gkd-ssh-agent-standalone.o `test -f 'daemon/ssh-agent/gkd-ssh-agent-standalone.c' || echo '$(srcdir)/'`daemon/ssh-agent/gkd-ssh-agent-standalone.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) daemon/ssh-agent/$(DEPDIR)/gkd_ssh_agent_standalone-gkd-ssh-agent-standalone.Tpo daemon/ssh-agent/$(DEPDIR)/gkd_ssh_agent_standalone-gkd-ssh-agent-standalone.Po

=== modified file 'NEWS'
--- NEWS	2014-12-06 18:47:09 +0000
+++ NEWS	2015-02-27 19:55:06 +0000
@@ -1,3 +1,9 @@
+Changes in version 3.15.90 are:
+ * Fix leaks [#738508]
+ * Refactoring
+ * Build fixes [#740190]
+ * Updated translations
+
 Changes in version 3.14.0 are:
  * Remove residual GTK+ usage
  * Updated translations

=== modified file 'configure'
--- configure	2014-12-06 18:47:09 +0000
+++ configure	2015-02-27 19:55:06 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnome-keyring 3.14.0.
+# Generated by GNU Autoconf 2.69 for gnome-keyring 3.15.90.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnome-keyring'
 PACKAGE_TARNAME='gnome-keyring'
-PACKAGE_VERSION='3.14.0'
-PACKAGE_STRING='gnome-keyring 3.14.0'
+PACKAGE_VERSION='3.15.90'
+PACKAGE_STRING='gnome-keyring 3.15.90'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL='https://wiki.gnome.org/Projects/GnomeKeyring'
 
@@ -1465,7 +1465,7 @@
   # 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 gnome-keyring 3.14.0 to adapt to many kinds of systems.
+\`configure' configures gnome-keyring 3.15.90 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1535,7 +1535,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnome-keyring 3.14.0:";;
+     short | recursive ) echo "Configuration of gnome-keyring 3.15.90:";;
    esac
   cat <<\_ACEOF
 
@@ -1707,7 +1707,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnome-keyring configure 3.14.0
+gnome-keyring configure 3.15.90
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2130,7 +2130,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gnome-keyring $as_me 3.14.0, which was
+It was created by gnome-keyring $as_me 3.15.90, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3022,7 +3022,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-keyring'
- VERSION='3.14.0'
+ VERSION='3.15.90'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17777,7 +17777,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gnome-keyring $as_me 3.14.0, which was
+This file was extended by gnome-keyring $as_me 3.15.90, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17844,7 +17844,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gnome-keyring config.status 3.14.0
+gnome-keyring config.status 3.15.90
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2014-12-06 18:47:09 +0000
+++ configure.ac	2015-02-27 19:55:06 +0000
@@ -1,5 +1,5 @@
 AC_INIT(gnome-keyring,
-        3.14.0,
+        3.15.90,
         [[e-mail]],
         [gnome-keyring],
         [https://wiki.gnome.org/Projects/GnomeKeyring])

=== modified file 'daemon/dbus/gkd-dbus.c'
--- daemon/dbus/gkd-dbus.c	2014-12-06 18:47:09 +0000
+++ daemon/dbus/gkd-dbus.c	2015-02-27 19:55:06 +0000
@@ -102,7 +102,6 @@
 
 		const gchar **env;
 		DBusMessageIter items, entry;
-		gchar **parts;
 
 		env = gkd_util_get_environment ();
 		g_return_val_if_fail (env, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
@@ -113,13 +112,17 @@
 		if (!dbus_message_iter_open_container (&args, DBUS_TYPE_ARRAY, "{ss}", &items))
 			g_return_val_if_reached (DBUS_HANDLER_RESULT_NEED_MEMORY);
 		while (*env) {
+			gchar **parts;
 			parts = g_strsplit (*env, "=", 2);
 			g_return_val_if_fail (parts && parts[0] && parts[1], DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 			if (!dbus_message_iter_open_container (&items, DBUS_TYPE_DICT_ENTRY, NULL, &entry) ||
 			    !dbus_message_iter_append_basic (&entry, DBUS_TYPE_STRING, &parts[0]) ||
 			    !dbus_message_iter_append_basic (&entry, DBUS_TYPE_STRING, &parts[1]) ||
-			    !dbus_message_iter_close_container (&items, &entry))
+			    !dbus_message_iter_close_container (&items, &entry)) {
+				g_strfreev (parts);
 				g_return_val_if_reached (DBUS_HANDLER_RESULT_NEED_MEMORY);
+			}
+			g_strfreev (parts);
 			++env;
 		}
 		if (!dbus_message_iter_close_container (&args, &items))

=== modified file 'daemon/dbus/gkd-secret-service.c'
--- daemon/dbus/gkd-secret-service.c	2014-12-06 18:47:09 +0000
+++ daemon/dbus/gkd-secret-service.c	2015-02-27 19:55:06 +0000
@@ -1245,6 +1245,9 @@
 	g_hash_table_destroy (self->aliases);
 	self->aliases = NULL;
 
+	g_free (self->alias_directory);
+	self->alias_directory = NULL;
+
 	G_OBJECT_CLASS (gkd_secret_service_parent_class)->finalize (obj);
 }
 

=== modified file 'daemon/dbus/test-dbus-items.c'
--- daemon/dbus/test-dbus-items.c	2014-04-06 23:26:34 +0000
+++ daemon/dbus/test-dbus-items.c	2015-02-27 19:55:06 +0000
@@ -159,8 +159,10 @@
 	g_assert_cmpuint (modified, >, (g_get_real_time () / G_TIME_SPAN_SECOND) - 10);
 	g_assert_cmpuint (created, ==, modified);
 
-	if (!g_test_thorough ())
+	if (!g_test_thorough ()) {
+		g_free (item);
 		return;
+	}
 
 	/* Unfortunately have to wait 1.25 seconds here */
 	g_usleep (G_TIME_SPAN_SECOND + (G_TIME_SPAN_SECOND / 4));

=== modified file 'daemon/gpg-agent/Makefile.am'
--- daemon/gpg-agent/Makefile.am	2014-12-06 18:47:09 +0000
+++ daemon/gpg-agent/Makefile.am	2015-02-27 19:55:06 +0000
@@ -13,18 +13,3 @@
 libgkd_gpg_agent_la_CFLAGS = \
 	$(GCK_CFLAGS) \
 	$(GCR_CFLAGS)
-
-# ------------------------------------------------------------------------------
-# Standalone binary
-
-noinst_PROGRAMS += \
-	gkd-gpg-agent-standalone
-
-gkd_gpg_agent_standalone_SOURCES = \
-	daemon/gpg-agent/gkd-gpg-agent-standalone.c
-gkd_gpg_agent_standalone_CFLAGS = \
-	$(GCK_CFLAGS)
-gkd_gpg_agent_standalone_LDADD = \
-	libgkd-gpg-agent.la \
-	libegg.la \
-	$(DAEMON_LIBS)

=== modified file 'daemon/gpg-agent/gkd-gpg-agent-ops.c'
--- daemon/gpg-agent/gkd-gpg-agent-ops.c	2014-12-06 18:47:09 +0000
+++ daemon/gpg-agent/gkd-gpg-agent-ops.c	2015-02-27 19:55:06 +0000
@@ -23,6 +23,8 @@
 #include "gkd-gpg-agent.h"
 #include "gkd-gpg-agent-private.h"
 
+#include "daemon/login/gkd-login.h"
+
 #include "egg/egg-error.h"
 #include "egg/egg-secure-memory.h"
 
@@ -48,31 +50,6 @@
  * PASSWORD STUFF
  */
 
-static void
-keyid_to_field_attribute (const gchar *keyid,
-                          GckBuilder *attrs)
-{
-	GString *fields = g_string_sized_new (128);
-
-	g_assert (keyid);
-	g_assert (attrs);
-
-	/* Remember that attribute names are sorted */
-
-	g_string_append (fields, "keyid");
-	g_string_append_c (fields, '\0');
-	g_string_append (fields, keyid);
-	g_string_append_c (fields, '\0');
-
-	g_string_append (fields, "source");
-	g_string_append_c (fields, '\0');
-	g_string_append (fields, "gnome-keyring:gpg-agent");
-	g_string_append_c (fields, '\0');
-
-	gck_builder_add_data (attrs, CKA_G_FIELDS, (const guchar *)fields->str, fields->len);
-	g_string_free (fields, TRUE);
-}
-
 static gchar*
 calculate_label_for_key (const gchar *keyid, const gchar *description)
 {
@@ -107,191 +84,11 @@
 	return label;
 }
 
-static GList*
-find_saved_items (GckSession *session, GckAttributes *attrs)
-{
-	GckBuilder builder = GCK_BUILDER_INIT;
-	GError *error = NULL;
-	const GckAttribute *attr;
-	GckObject *search;
-	GList *results;
-	gpointer data;
-	gsize n_data;
-
-	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_G_SEARCH);
-	gck_builder_add_boolean (&builder, CKA_TOKEN, FALSE);
-
-	attr = gck_attributes_find (attrs, CKA_G_COLLECTION);
-	if (attr != NULL)
-		gck_builder_add_attribute (&builder, attr);
-
-	attr = gck_attributes_find (attrs, CKA_G_FIELDS);
-	g_return_val_if_fail (attr != NULL, NULL);
-	gck_builder_add_attribute (&builder, attr);
-
-	search = gck_session_create_object (session, gck_builder_end (&builder), NULL, &error);
-	if (search == NULL) {
-		g_warning ("couldn't perform search for gpg agent stored passphrases: %s",
-		           egg_error_message (error));
-		g_clear_error (&error);
-		return NULL;
-	}
-
-	data = gck_object_get_data (search, CKA_G_MATCHED, NULL, &n_data, &error);
-	gck_object_destroy (search, NULL, NULL);
-	g_object_unref (search);
-
-	if (data == NULL) {
-		g_warning ("couldn't retrieve list of gpg agent stored passphrases: %s",
-		           egg_error_message (error));
-		g_clear_error (&error);
-		return NULL;
-	}
-
-	results = gck_objects_from_handle_array (session, data, n_data / sizeof (CK_ULONG));
-
-	g_free (data);
-	return results;
-}
-
 static void
-do_save_password (GckSession *session, const gchar *keyid, const gchar *description,
-                  const gchar *password, GckAttributes *options)
-{
-	GckBuilder builder;
-	GckAttributes *attrs;
-	gpointer identifier;
-	gsize n_identifier;
-	GList *previous;
-	GError *error = NULL;
-	GckObject *item;
-	gchar *text;
-	gchar *label;
-	gint i;
-
-	g_assert (password);
-
-	/* Can't save anything if there was no keyid */
-	if (keyid == NULL)
-		return;
-
-	/* Sending a password, needs to be secure */
-	gck_builder_init_full (&builder, GCK_BUILDER_SECURE_MEMORY);
-
-	/* Build up basic set of attributes */
-	gck_builder_add_boolean (&builder, CKA_TOKEN, TRUE);
-	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_SECRET_KEY);
-	keyid_to_field_attribute (keyid, &builder);
-
-	/* Bring in all the unlock options */
-	for (i = 0; options && i < gck_attributes_count (options); ++i)
-		gck_builder_add_attribute (&builder, gck_attributes_at (options, i));
-
-	/* Find a previously stored object like this, and replace if so */
-	attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
-	previous = find_saved_items (session, attrs);
-	if (previous) {
-		identifier = gck_object_get_data (previous->data, CKA_ID, NULL, &n_identifier, NULL);
-		if (identifier != NULL)
-			gck_builder_add_data (&builder, CKA_ID, identifier, n_identifier);
-		g_free (identifier);
-		gck_list_unref_free (previous);
-	}
-
-	text = calculate_label_for_key (keyid, description);
-	label = g_strdup_printf (_("PGP Key: %s"), text);
-	g_free (text);
-
-	/* Put in the remainder of the attributes */
-	gck_builder_add_all (&builder, attrs);
-	gck_builder_add_string (&builder, CKA_VALUE, password);
-	gck_builder_add_string (&builder, CKA_LABEL, label);
-	gck_attributes_unref (attrs);
-	g_free (label);
-
-	item = gck_session_create_object (session, gck_builder_end (&builder), NULL, &error);
-	if (item == NULL) {
-		g_warning ("couldn't store gpg agent password: %s", egg_error_message (error));
-		g_clear_error (&error);
-	}
-
-	if (item != NULL)
-		g_object_unref (item);
-}
-
-static gboolean
 do_clear_password (GckSession *session, const gchar *keyid)
 {
-	GckBuilder builder = GCK_BUILDER_INIT;
-	GckAttributes *attrs;
-	GList *objects, *l;
-	GError *error = NULL;
-
-	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_SECRET_KEY);
-	keyid_to_field_attribute (keyid, &builder);
-
-	attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
-	objects = find_saved_items (session, attrs);
-	gck_attributes_unref (attrs);
-
-	if (!objects)
-		return TRUE;
-
-	/* Delete first item */
-	for (l = objects; l; l = g_list_next (l)) {
-		if (gck_object_destroy (l->data, NULL, &error)) {
-			break; /* Only delete the first item */
-		} else {
-			g_warning ("couldn't clear gpg agent password: %s",
-			           egg_error_message (error));
-			g_clear_error (&error);
-		}
-	}
-
-	gck_list_unref_free (objects);
-	return TRUE;
-}
-
-static gchar*
-do_lookup_password (GckSession *session, const gchar *keyid)
-{
-	GckBuilder builder = GCK_BUILDER_INIT;
-	GckAttributes *attrs;
-	GList *objects, *l;
-	GError *error = NULL;
-	gpointer data = NULL;
-	gsize n_data;
-
-	if (keyid == NULL)
-		return NULL;
-
-	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_SECRET_KEY);
-	keyid_to_field_attribute (keyid, &builder);
-
-	attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
-	objects = find_saved_items (session, attrs);
-	gck_attributes_unref (attrs);
-
-	if (!objects)
-		return NULL;
-
-	/* Return first password */
-	for (l = objects; l; l = g_list_next (l)) {
-		data = gck_object_get_data_full (l->data, CKA_VALUE, egg_secure_realloc, NULL, &n_data, &error);
-		if (error) {
-			if (!g_error_matches (error, GCK_ERROR, CKR_USER_NOT_LOGGED_IN))
-				g_warning ("couldn't lookup gpg agent password: %s", egg_error_message (error));
-			g_clear_error (&error);
-			data = NULL;
-		} else {
-			break;
-		}
-	}
-
-	gck_list_unref_free (objects);
-
-	/* Data is null terminated */
-	return data;
+	gkd_login_clear_password (session, "keyid", keyid,
+	                          "source", "gnome-keyring:gpg-agent", NULL);
 }
 
 static void
@@ -330,11 +127,9 @@
                       const gchar *description,
                       gboolean confirm)
 {
-	GckBuilder builder = GCK_BUILDER_INIT;
 	GcrPrompt *prompt;
 	GError *error = NULL;
 	gboolean auto_unlock;
-	GList *objects;
 	const gchar *choice;
 
 	g_assert (GCK_IS_SESSION (session));
@@ -360,23 +155,7 @@
 		gcr_prompt_set_choice_label (prompt, NULL);
 
 	} else {
-		auto_unlock = FALSE;
-
-		gck_builder_add_ulong (&builder, CKA_CLASS, CKO_G_COLLECTION);
-		gck_builder_add_string (&builder, CKA_ID, "login");
-		gck_builder_add_boolean (&builder, CKA_G_LOCKED, FALSE);
-
-		/* Check if the login keyring is usable */
-		objects = gck_session_find_objects (session, gck_builder_end (&builder), NULL, &error);
-
-		if (error) {
-			g_warning ("gpg agent couldn't lookup for login keyring: %s", egg_error_message (error));
-			g_clear_error (&error);
-		} else if (objects) {
-			auto_unlock = TRUE;
-		}
-
-		gck_list_unref_free (objects);
+		auto_unlock = gkd_login_available (session);
 
 		choice = NULL;
 		if (auto_unlock)
@@ -393,20 +172,21 @@
 do_get_password (GckSession *session, const gchar *keyid, const gchar *errmsg,
                  const gchar *prompt_text, const gchar *description, gboolean confirm)
 {
-	GckBuilder builder = GCK_BUILDER_INIT;
 	GSettings *settings;
-	GckAttributes *attrs;
 	gchar *password = NULL;
 	GcrPrompt *prompt;
 	gboolean chosen;
 	GError *error = NULL;
 	gint lifetime;
 	gchar *method;
+	gchar *label;
+	gchar *text;
 
 	g_assert (GCK_IS_SESSION (session));
 
 	/* Do we have the keyid? */
-	password = do_lookup_password (session, keyid);
+	password = gkd_login_lookup_password (session, "keyid", keyid,
+	                                      "source", "gnome-keyring:gpg-agent", NULL);
 	if (password != NULL)
 		return password;
 
@@ -428,33 +208,26 @@
 		chosen = gcr_prompt_get_choice_chosen (prompt);
 
 		if (chosen) {
-			g_settings_set_string (settings, "gpg-cache-method", GCR_UNLOCK_OPTION_ALWAYS);
-			gck_builder_add_string (&builder, CKA_G_COLLECTION, "login");
+			method = g_strdup (GCR_UNLOCK_OPTION_ALWAYS);
+			lifetime = -1;
 
 		} else {
 			method = g_settings_get_string (settings, "gpg-cache-method");
 			lifetime = g_settings_get_int (settings, "gpg-cache-ttl");
-
-			if (g_strcmp0 (method, GCR_UNLOCK_OPTION_IDLE) == 0) {
-				gck_builder_add_boolean (&builder, CKA_GNOME_TRANSIENT, TRUE);
-				gck_builder_add_ulong (&builder, CKA_G_DESTRUCT_IDLE, lifetime);
-
-			} else if (g_strcmp0 (method, GCR_UNLOCK_OPTION_TIMEOUT) == 0) {
-				gck_builder_add_boolean (&builder, CKA_GNOME_TRANSIENT, TRUE);
-				gck_builder_add_ulong (&builder, CKA_G_DESTRUCT_AFTER, lifetime);
-
-			} else if (g_strcmp0 (method, GCR_UNLOCK_OPTION_SESSION)){
-				g_message ("Unsupported gpg-cache-method setting: %s", method);
+			if (g_str_equal (method, GCR_UNLOCK_OPTION_ALWAYS)) {
+				g_free (method);
+				method = NULL;
 			}
-
-			gck_builder_add_string (&builder, CKA_G_COLLECTION, "session");
-			g_free (method);
 		}
 
 		/* Now actually save the password */
-		attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
-		do_save_password (session, keyid, description, password, attrs);
-		gck_attributes_unref (attrs);
+		text = calculate_label_for_key (keyid, description);
+		label = g_strdup_printf (_("PGP Key: %s"), text);
+		gkd_login_store_password (session, password, label, method, lifetime,
+		                          "keyid", keyid, "source", "gnome-keyring:gpg-agent", NULL);
+		g_free (label);
+		g_free (method);
+		g_free (text);
 	}
 
 	g_clear_object (&prompt);

=== removed file 'daemon/gpg-agent/gkd-gpg-agent-standalone.c'
--- daemon/gpg-agent/gkd-gpg-agent-standalone.c	2014-12-06 18:47:09 +0000
+++ daemon/gpg-agent/gkd-gpg-agent-standalone.c	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-/*
- * gnome-keyring
- *
- * Copyright (C) 2010 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gkd-gpg-agent.h"
-#include "gkd-gpg-agent-private.h"
-
-#include "egg/egg-error.h"
-#include "egg/egg-secure-memory.h"
-
-#include <gck/gck.h>
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <pwd.h>
-#include <string.h>
-#include <unistd.h>
-
-EGG_SECURE_DEFINE_GLIB_GLOBALS ();
-
-static gboolean
-accept_client (GIOChannel *channel, GIOCondition cond, gpointer unused)
-{
-	gkd_gpg_agent_accept ();
-	return TRUE;
-}
-
-static gboolean
-authenticate_slot (GckModule *module, GckSlot *slot, gchar *label, gchar **password, gpointer unused)
-{
-	gchar *prompt = g_strdup_printf ("Enter token password (%s): ", label);
-	char *result = getpass (prompt);
-	g_free (prompt);
-	*password = g_strdup (result);
-	memset (result, 0, strlen (result));
-	return TRUE;
-}
-
-static gboolean
-authenticate_object (GckModule *module, GckObject *object, gchar *label, gchar **password)
-{
-	gchar *prompt = g_strdup_printf ("Enter object password (%s): ", label);
-	char *result = getpass (prompt);
-	g_free (prompt);
-	*password = g_strdup (result);
-	memset (result, 0, strlen (result));
-	return TRUE;
-}
-
-int
-main(int argc, char *argv[])
-{
-	GckModule *module;
-	GError *error = NULL;
-	GIOChannel *channel;
-	GMainLoop *loop;
-	gboolean ret;
-	int sock;
-
-#if !GLIB_CHECK_VERSION(2,35,0)
-	g_type_init ();
-#endif
-
-	if (argc <= 1) {
-		g_message ("specify pkcs11 module on the command line");
-		return 1;
-	}
-
-	module = gck_module_initialize (argv[1], NULL, &error);
-	if (!module) {
-		g_message ("couldn't load pkcs11 module: %s", egg_error_message (error));
-		g_clear_error (&error);
-		return 1;
-	}
-
-	g_signal_connect (module, "authenticate-slot", G_CALLBACK (authenticate_slot), NULL);
-	g_signal_connect (module, "authenticate-object", G_CALLBACK (authenticate_object), NULL);
-
-	ret = gkd_gpg_agent_initialize_with_module (module);
-	g_object_unref (module);
-
-	if (ret == FALSE)
-		return 1;
-
-	sock = gkd_gpg_agent_startup ("/tmp");
-	if (sock == -1)
-		return 1;
-
-	channel = g_io_channel_unix_new (sock);
-	g_io_add_watch (channel, G_IO_IN | G_IO_HUP, accept_client, NULL);
-	g_io_channel_unref (channel);
-
-	g_print ("GPG_AGENT_INFO=%s\n", g_getenv ("GPG_AGENT_INFO"));
-
-	/* Run a main loop */
-	loop = g_main_loop_new (NULL, FALSE);
-	g_main_loop_run (loop);
-	g_main_loop_unref (loop);
-
-	gkd_gpg_agent_shutdown ();
-	gkd_gpg_agent_uninitialize ();
-
-	return 0;
-}

=== modified file 'daemon/gpg-agent/gkd-gpg-agent.c'
--- daemon/gpg-agent/gkd-gpg-agent.c	2014-12-06 18:47:09 +0000
+++ daemon/gpg-agent/gkd-gpg-agent.c	2015-02-27 19:55:06 +0000
@@ -207,6 +207,7 @@
 	}
 
 	g_io_channel_shutdown (call.channel, FALSE, NULL);
+	g_io_channel_unref (call.channel);
 	g_object_unref (call.module);
 
 	close (call.sock);

=== modified file 'daemon/login/Makefile.am'
--- daemon/login/Makefile.am	2014-12-06 18:47:09 +0000
+++ daemon/login/Makefile.am	2015-02-27 19:55:06 +0000
@@ -10,6 +10,7 @@
 	$(NULL)
 libgkd_login_la_CFLAGS = \
 	$(GCK_CFLAGS) \
+	$(GCR_CFLAGS) \
 	$(GOBJECT_CFLAGS)
 libgkd_login_la_LIBADD = \
 	$(GCK_LIBS) \

=== modified file 'daemon/login/gkd-login.c'
--- daemon/login/gkd-login.c	2014-12-06 18:47:09 +0000
+++ daemon/login/gkd-login.c	2015-02-27 19:55:06 +0000
@@ -31,11 +31,14 @@
 #include "pkcs11/wrap-layer/gkm-wrap-layer.h"
 
 #include <gck/gck.h>
+#include <gcr/gcr-unlock-options.h>
 
 #include <glib/gi18n.h>
 
 #include <string.h>
 
+EGG_SECURE_DECLARE (gkd_login);
+
 static GList*
 module_instances (void)
 {
@@ -82,6 +85,10 @@
 	GckSlot *slot = NULL;
 	GError *error = NULL;
 	GckSession *session;
+	GList *owned = NULL;
+
+	if (modules == NULL)
+		modules = owned = module_instances ();
 
 	slot = gck_modules_token_for_uri (modules, "pkcs11:token=Secret%20Store", &error);
 	if (!slot) {
@@ -96,6 +103,7 @@
 	}
 
 	g_object_unref (slot);
+	g_list_free_full (owned, g_object_unref);
 
 	return session;
 }
@@ -415,3 +423,295 @@
 	gck_list_unref_free (modules);
 	return result;
 }
+
+gboolean
+gkd_login_available (GckSession *session)
+{
+	GckBuilder builder = GCK_BUILDER_INIT;
+	gboolean available = FALSE;
+	GError *error = NULL;
+	GList *objects;
+
+	if (!session)
+		session = lookup_login_session (NULL);
+	else
+		g_object_ref (session);
+
+	if (session) {
+		gck_builder_add_ulong (&builder, CKA_CLASS, CKO_G_COLLECTION);
+		gck_builder_add_string (&builder, CKA_ID, "login");
+		gck_builder_add_boolean (&builder, CKA_G_LOCKED, FALSE);
+
+		/* Check if the login keyring is usable */
+		objects = gck_session_find_objects (session, gck_builder_end (&builder), NULL, &error);
+		if (error) {
+			g_warning ("couldn't lookup login keyring: %s", error->message);
+			g_clear_error (&error);
+		} else if (objects) {
+			available = TRUE;
+		}
+		g_list_free_full (objects, g_object_unref);
+	}
+
+	g_object_unref (session);
+	return available;
+}
+
+static GList *
+find_saved_items (GckSession *session,
+                  GckAttributes *attrs)
+{
+	GckBuilder builder = GCK_BUILDER_INIT;
+	GError *error = NULL;
+	const GckAttribute *attr;
+	GckObject *search;
+	GList *results;
+	gpointer data;
+	gsize n_data;
+
+	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_G_SEARCH);
+	gck_builder_add_boolean (&builder, CKA_TOKEN, FALSE);
+
+	attr = gck_attributes_find (attrs, CKA_G_COLLECTION);
+	if (attr != NULL)
+		gck_builder_add_attribute (&builder, attr);
+
+	attr = gck_attributes_find (attrs, CKA_G_FIELDS);
+	g_return_val_if_fail (attr != NULL, NULL);
+	gck_builder_add_attribute (&builder, attr);
+
+	search = gck_session_create_object (session, gck_builder_end (&builder), NULL, &error);
+	if (search == NULL) {
+		g_warning ("couldn't perform search for gpg agent stored passphrases: %s",
+		           egg_error_message (error));
+		g_clear_error (&error);
+		return NULL;
+	}
+
+	data = gck_object_get_data (search, CKA_G_MATCHED, NULL, &n_data, &error);
+	gck_object_destroy (search, NULL, NULL);
+	g_object_unref (search);
+
+	if (data == NULL) {
+		g_warning ("couldn't retrieve list of gpg agent stored passphrases: %s",
+		           egg_error_message (error));
+		g_clear_error (&error);
+		return NULL;
+	}
+
+	results = gck_objects_from_handle_array (session, data, n_data / sizeof (CK_ULONG));
+
+	g_free (data);
+	return results;
+}
+
+static gboolean
+fields_to_attribute (GckBuilder *builder,
+                     const gchar *field,
+                     va_list va)
+{
+	GString *fields = g_string_sized_new (128);
+	const gchar *last = NULL;
+	const gchar *value;
+
+	while (field) {
+		if (g_strcmp0 (last, field) >= 0) {
+			g_critical ("lookup fields must be sorted '%s' >= '%s'", last, field);
+			return FALSE;
+		}
+
+		last = field;
+		value = va_arg (va, const gchar *);
+		g_return_val_if_fail (value != NULL, FALSE);
+
+		g_string_append (fields, field);
+		g_string_append_c (fields, '\0');
+		g_string_append (fields, value);
+		g_string_append_c (fields, '\0');
+
+		field = va_arg (va, const gchar *);
+	}
+
+	gck_builder_add_data (builder, CKA_G_FIELDS, (const guchar *)fields->str, fields->len);
+	g_string_free (fields, TRUE);
+	return TRUE;
+}
+
+gchar *
+gkd_login_lookup_password (GckSession *session,
+                           const gchar *field,
+                           ...)
+{
+	GckBuilder builder = GCK_BUILDER_INIT;
+	GckAttributes *attrs;
+	GList *objects, *l;
+	GError *error = NULL;
+	gpointer data = NULL;
+	gsize length;
+	va_list va;
+
+	if (!session)
+		session = lookup_login_session (NULL);
+	else
+		session = g_object_ref (session);
+	if (!session)
+		return NULL;
+
+	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_SECRET_KEY);
+
+	va_start (va, field);
+	if (!fields_to_attribute (&builder, field, va))
+		g_return_val_if_reached (FALSE);
+	va_end (va);
+
+	attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
+	objects = find_saved_items (session, attrs);
+	gck_attributes_unref (attrs);
+
+	/* Return first password */
+	data = NULL;
+	for (l = objects; l; l = g_list_next (l)) {
+		data = gck_object_get_data_full (l->data, CKA_VALUE, egg_secure_realloc, NULL, &length, &error);
+		if (error) {
+			if (!g_error_matches (error, GCK_ERROR, CKR_USER_NOT_LOGGED_IN))
+				g_warning ("couldn't lookup gpg agent password: %s", egg_error_message (error));
+			g_clear_error (&error);
+			data = NULL;
+		} else {
+			break;
+		}
+	}
+
+	g_list_free_full (objects, g_object_unref);
+	g_object_unref (session);
+
+	/* Data is null terminated */
+	return data;
+}
+
+void
+gkd_login_clear_password (GckSession *session,
+                          const gchar *field,
+                          ...)
+{
+	GckBuilder builder = GCK_BUILDER_INIT;
+	GckAttributes *attrs;
+	GList *objects, *l;
+	GError *error = NULL;
+	va_list va;
+
+	if (!session)
+		session = lookup_login_session (NULL);
+	else
+		session = g_object_ref (session);
+	if (!session)
+		return;
+
+	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_SECRET_KEY);
+
+	va_start (va, field);
+	if (!fields_to_attribute (&builder, field, va))
+		g_return_if_reached ();
+	va_end (va);
+
+	attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
+	objects = find_saved_items (session, attrs);
+	gck_attributes_unref (attrs);
+
+	/* Delete first item */
+	for (l = objects; l; l = g_list_next (l)) {
+		if (gck_object_destroy (l->data, NULL, &error))
+			break; /* Only delete the first item */
+		g_warning ("couldn't clear assword: %s", error->message);
+		g_clear_error (&error);
+	}
+
+	g_list_free_full (objects, g_object_unref);
+	g_object_unref (session);
+}
+
+gboolean
+gkd_login_store_password (GckSession *session,
+                          const gchar *password,
+                          const gchar *label,
+                          const gchar *method,
+                          gint lifetime,
+                          const gchar *field,
+                          ...)
+{
+	GckBuilder builder = GCK_BUILDER_INIT;
+	GckAttributes *attrs;
+	guchar *identifier;
+	GList *previous;
+	gboolean ret = FALSE;
+	GckObject *item;
+	GError *error = NULL;
+	gsize length;
+	va_list va;
+
+	if (!method)
+		method = GCR_UNLOCK_OPTION_SESSION;
+
+	if (!session)
+		session = lookup_login_session (NULL);
+	else
+		session = g_object_ref (session);
+	if (!session)
+		return FALSE;
+
+	va_start (va, field);
+	if (!fields_to_attribute (&builder, field, va))
+		g_return_val_if_reached (FALSE);
+	va_end (va);
+
+	if (g_str_equal (method, GCR_UNLOCK_OPTION_ALWAYS)) {
+		gck_builder_add_string (&builder, CKA_G_COLLECTION, "login");
+
+	} else {
+		if (g_str_equal (method, GCR_UNLOCK_OPTION_IDLE)) {
+			gck_builder_add_boolean (&builder, CKA_GNOME_TRANSIENT, TRUE);
+			gck_builder_add_ulong (&builder, CKA_G_DESTRUCT_IDLE, lifetime);
+
+		} else if (g_str_equal (method, GCR_UNLOCK_OPTION_TIMEOUT)) {
+			gck_builder_add_boolean (&builder, CKA_GNOME_TRANSIENT, TRUE);
+			gck_builder_add_ulong (&builder, CKA_G_DESTRUCT_AFTER, lifetime);
+
+		} else if (!g_str_equal (method, GCR_UNLOCK_OPTION_SESSION)) {
+			g_message ("Unsupported gpg-cache-method setting: %s", method);
+		}
+		gck_builder_add_string (&builder, CKA_G_COLLECTION, "session");
+	}
+
+	gck_builder_add_boolean (&builder, CKA_TOKEN, TRUE);
+	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_SECRET_KEY);
+
+	/* Find a previously stored object like this, and replace if so */
+	attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
+	previous = find_saved_items (session, attrs);
+	if (previous) {
+		identifier = gck_object_get_data (previous->data, CKA_ID, NULL, &length, NULL);
+		if (identifier != NULL)
+			gck_builder_add_data (&builder, CKA_ID, identifier, length);
+		g_free (identifier);
+		g_list_free_full (previous, g_object_unref);
+	}
+
+	/* Put in the remainder of the attributes */
+	gck_builder_add_all (&builder, attrs);
+	gck_builder_add_string (&builder, CKA_VALUE, password);
+	gck_builder_add_string (&builder, CKA_LABEL, label);
+	gck_attributes_unref (attrs);
+
+	item = gck_session_create_object (session, gck_builder_end (&builder), NULL, &error);
+	if (item == NULL) {
+		g_warning ("couldn't store gpg agent password: %s", egg_error_message (error));
+		g_clear_error (&error);
+		ret = FALSE;
+	} else {
+		g_object_unref (item);
+		ret = TRUE;
+	}
+
+	g_object_unref (session);
+	return ret;
+}

=== modified file 'daemon/login/gkd-login.h'
--- daemon/login/gkd-login.h	2014-04-06 23:26:34 +0000
+++ daemon/login/gkd-login.h	2015-02-27 19:55:06 +0000
@@ -23,9 +23,29 @@
 
 #include <glib.h>
 
+typedef struct _GckSession GckSession;
+
 gboolean          gkd_login_unlock                   (const gchar *master);
 
 gboolean          gkd_login_change_lock              (const gchar *original,
                                                       const gchar *master);
 
+gboolean          gkd_login_available                (GckSession *session);
+
+gchar *           gkd_login_lookup_password          (GckSession *session,
+						      const gchar *field,
+						      ...) G_GNUC_NULL_TERMINATED;
+
+void              gkd_login_clear_password           (GckSession *session,
+						      const gchar *field,
+						      ...) G_GNUC_NULL_TERMINATED;
+
+gboolean          gkd_login_store_password           (GckSession *session,
+						      const gchar *password,
+						      const gchar *label,
+						      const gchar *method,
+						      gint lifetime,
+						      const gchar *field,
+						      ...) G_GNUC_NULL_TERMINATED;
+
 #endif /* __GKD_LOGIN_H__ */

=== modified file 'daemon/ssh-agent/gkd-ssh-agent-ops.c'
--- daemon/ssh-agent/gkd-ssh-agent-ops.c	2012-05-16 17:39:27 +0000
+++ daemon/ssh-agent/gkd-ssh-agent-ops.c	2015-02-27 19:55:06 +0000
@@ -139,6 +139,7 @@
 		en = gck_modules_enumerate_objects (modules, search, GCK_SESSION_AUTHENTICATE | GCK_SESSION_READ_WRITE);
 
 		for (;;) {
+			gboolean done;
 			object = gck_enumerator_next (en, NULL, &error);
 			if (!object) {
 				if (error) {
@@ -148,7 +149,9 @@
 				break;
 			}
 
-			if (!(func) (object, user_data))
+			done = !(func) (object, user_data);
+			g_object_unref (object);
+			if (done)
 				break;
 		}
 
@@ -435,6 +438,7 @@
 			g_free (label);
 			return;
 		}
+		g_free (label);
 	}
 
 	/* Lock token objects, remove session objects */
@@ -773,9 +777,10 @@
 	g_return_val_if_fail (en, FALSE);
 
 	all_attrs = NULL;
-	do {
-		obj = gck_enumerator_next (en, NULL, &error);
-	} while (obj && load_identity_v2_attributes (obj, &all_attrs));
+	while ((obj = gck_enumerator_next (en, NULL, &error))) {
+		load_identity_v2_attributes (obj, &all_attrs);
+		g_object_unref (obj);
+	}
 
 	g_object_unref (en);
 
@@ -839,10 +844,10 @@
 	                                    GCK_SESSION_AUTHENTICATE | GCK_SESSION_READ_WRITE);
 
 	all_attrs = NULL;
-	do {
-		obj = gck_enumerator_next (en, NULL, &error);
-	} while (obj && load_identity_v1_attributes (obj, &all_attrs));
-
+	while ((obj = gck_enumerator_next (en, NULL, &error))) {
+		load_identity_v1_attributes (obj, &all_attrs);
+		g_object_unref (obj);
+	}
 	g_object_unref (en);
 
 	if (error) {

=== modified file 'daemon/test-startup.c'
--- daemon/test-startup.c	2014-04-06 23:26:34 +0000
+++ daemon/test-startup.c	2015-02-27 19:55:06 +0000
@@ -232,13 +232,13 @@
 	output = gkd_test_launch_daemon (test->directory, argv, &pid,
 	                                 "XDG_RUNTIME_DIR", "/tmp/keyring-test-two",
 	                                 NULL);
-	g_free (output);
+	g_strfreev (output);
 
 	/* Replace with the second daemon */
 	output = gkd_test_launch_daemon (test->directory, replace, &test->pid,
 	                                 "XDG_RUNTIME_DIR", "/tmp/keyring-test-two",
 	                                 NULL);
-	g_free (output);
+	g_strfreev (output);
 
 	/* The first daemon should have exited cleanly here */
 	g_assert_cmpint (waitpid (pid, &status, 0), ==, pid);

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-29 10:12:42 +0000
+++ debian/changelog	2015-02-27 19:55:06 +0000
@@ -1,3 +1,9 @@
+gnome-keyring (3.15.90-0ubuntu1) vivid; urgency=medium
+
+  * New upstream bugfix release.
+
+ -- Jackson Doak <[e-mail]>  Sat, 28 Feb 2015 06:42:02 +1100
+
 gnome-keyring (3.14.0-1ubuntu2) vivid; urgency=medium
 
   * Fix the gpg/ssh agent check syntax. Thanks to Sergey Romanov (LP:

=== modified file 'egg/egg-asn1x.c'
--- egg/egg-asn1x.c	2014-12-06 18:47:09 +0000
+++ egg/egg-asn1x.c	2015-02-27 19:55:06 +0000
@@ -2765,7 +2765,7 @@
 
 	/* Encode zero characters */
 	anode_clr_value (node);
-	anode_set_value (node, g_bytes_new_static ("", 0));
+	anode_take_value (node, g_bytes_new_static ("", 0));
 }
 
 GQuark
@@ -2828,7 +2828,7 @@
 	anode_write_integer_ulong (val, data, &n_data);
 
 	anode_clr_value (node);
-	anode_set_value (node, g_bytes_new_take (data, n_data));
+	anode_take_value (node, g_bytes_new_take (data, n_data));
 }
 
 gboolean
@@ -2979,7 +2979,7 @@
 	}
 
 	anode_clr_value (node);
-	anode_set_value (node, value);
+	anode_take_value (node, value);
 
 	an = node->data;
 	an->guarantee_unsigned = 0;
@@ -3003,7 +3003,7 @@
 	g_return_if_fail (value != NULL);
 	g_return_if_fail (anode_def_type (node) == EGG_ASN1X_INTEGER);
 
-	anode_set_value (node, value);
+	anode_take_value (node, value);
 	an = node->data;
 	an->guarantee_unsigned = 1;
 }
@@ -3151,6 +3151,7 @@
 
 	/* A failure, set the message manually so it doesn't get a prefix */
 	} else {
+		atlv_free (tlv);
 		an = node->data;
 		g_free (an->failure);
 		an->failure = g_strdup (msg);
@@ -3282,8 +3283,8 @@
 	                  type == EGG_ASN1X_UTF8_STRING ||
 	                  type == EGG_ASN1X_VISIBLE_STRING);
 
-	anode_set_value (node, g_bytes_new_with_free_func (data, n_data,
-	                                                   destroy, data));
+	anode_take_value (node, g_bytes_new_with_free_func (data, n_data,
+	                                                    destroy, data));
 }
 
 void
@@ -3307,7 +3308,7 @@
 	                  type == EGG_ASN1X_UTF8_STRING ||
 	                  type == EGG_ASN1X_VISIBLE_STRING);
 
-	anode_set_value (node, g_bytes_ref (bytes));
+	anode_set_value (node, bytes);
 }
 
 GBytes *

=== modified file 'egg/egg-cleanup.c'
--- egg/egg-cleanup.c	2014-04-06 23:26:34 +0000
+++ egg/egg-cleanup.c	2015-02-27 19:55:06 +0000
@@ -52,6 +52,7 @@
 		cleanup = (EggCleanup*)l->data;
 		if (cleanup->notify == notify && cleanup->user_data == user_data) {
 			registered_cleanups = g_slist_remove (registered_cleanups, cleanup);
+			g_free (cleanup);
 			break;
 		}
 	}

=== modified file 'egg/egg-hkdf.c'
--- egg/egg-hkdf.c	2014-04-06 23:26:34 +0000
+++ egg/egg-hkdf.c	2015-02-27 19:55:06 +0000
@@ -102,6 +102,7 @@
 			break;
 	}
 
+	gcry_md_close (md2);
 	g_free (alloc);
 	gcry_free (buffer);
 	return TRUE;

=== modified file 'egg/test-asn1.c'
--- egg/test-asn1.c	2014-04-06 23:26:34 +0000
+++ egg/test-asn1.c	2015-02-27 19:55:06 +0000
@@ -2385,6 +2385,7 @@
 	asn = egg_asn1x_create_quark (test_asn1_tab, g_quark_from_static_string ("1.5.13"));
 	g_assert (asn != NULL);
 	g_assert_cmpstr (egg_asn1x_name (asn), ==, "TestIntegers");
+	egg_asn1x_destroy (asn);
 }
 
 static void

=== modified file 'egg/test-dn.c'
--- egg/test-dn.c	2014-04-06 23:26:34 +0000
+++ egg/test-dn.c	2015-02-27 19:55:06 +0000
@@ -98,6 +98,7 @@
 	text = egg_dn_print_value (oid, asn);
 	g_assert_cmpstr (text, ==, "Thawte Personal Premium CA");
 	g_free (text);
+	g_bytes_unref (bytes);
 
 	/* Unknown oid */
 	oid = g_quark_from_static_string ("1.1.1.1.1.1");

=== modified file 'egg/test-padding.c'
--- egg/test-padding.c	2014-04-06 23:26:34 +0000
+++ egg/test-padding.c	2015-02-27 19:55:06 +0000
@@ -114,6 +114,7 @@
 	g_assert (result[5] == 0x00);
 	g_assert (result[6] == 'T');
 	g_assert (result[7] == 'E');
+	g_free (vesult);
 }
 
 static void

=== modified file 'egg/test-spawn.c'
--- egg/test-spawn.c	2014-04-06 23:26:34 +0000
+++ egg/test-spawn.c	2015-02-27 19:55:06 +0000
@@ -188,6 +188,8 @@
 	g_assert (data.completed);
 	g_assert_cmpstr (data.output, ==, "80 81 82 83 84\n");
 	g_assert_cmpstr (data.error, ==, "1\n2\n3\n4\n5\n");
+	g_free (data.error);
+	g_free (data.output);
 }
 
 static void
@@ -233,6 +235,8 @@
 	g_assert (data.completed);
 	g_assert_cmpstr (data.output, ==, "80 81 82 83 84\n");
 	g_assert_cmpstr (data.error, ==, "1\n2\n3\n4\n5\n");
+	g_free (data.error);
+	g_free (data.output);
 }
 
 static void
@@ -259,6 +263,8 @@
 	g_assert (data.finalized);
 	g_assert (data.completed);
 	g_assert (!data.output);
+	g_free (data.error);
+	g_free (data.output);
 }
 
 static void

=== modified file 'pam/test-pam.c'
--- pam/test-pam.c	2014-04-06 23:26:34 +0000
+++ pam/test-pam.c	2015-02-27 19:55:06 +0000
@@ -149,6 +149,7 @@
 			return;
 		}
 	} else if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+		g_error_free (error);
 		skip_test (test, "missing test pam config");
 		return;
 	}

=== modified file 'pkcs11/gkm/gkm-attributes.c'
--- pkcs11/gkm/gkm-attributes.c	2014-04-06 23:26:34 +0000
+++ pkcs11/gkm/gkm-attributes.c	2015-02-27 19:55:06 +0000
@@ -359,6 +359,7 @@
 	g_checksum_update (checksum, data, n_data);
 	result = attr->ulValueLen;
 	g_checksum_get_digest (checksum, attr->pValue, &result);
+	g_checksum_free (checksum);
 	attr->ulValueLen = result;
 	return CKR_OK;
 }

=== modified file 'pkcs11/gkm/gkm-credential.c'
--- pkcs11/gkm/gkm-credential.c	2014-12-06 18:47:09 +0000
+++ pkcs11/gkm/gkm-credential.c	2015-02-27 19:55:06 +0000
@@ -209,6 +209,10 @@
 		g_object_weak_unref (G_OBJECT (self->pv->object), object_went_away, self);
 	self->pv->object = NULL;
 
+	if (self->pv->secret)
+		g_object_unref (G_OBJECT (self->pv->secret));
+	self->pv->secret = NULL;
+
 	clear_data (self);
 
 	G_OBJECT_CLASS (gkm_credential_parent_class)->dispose (obj);

=== modified file 'pkcs11/gkm/gkm-data-asn1.c'
--- pkcs11/gkm/gkm-data-asn1.c	2014-04-06 23:26:34 +0000
+++ pkcs11/gkm/gkm-data-asn1.c	2015-02-27 19:55:06 +0000
@@ -43,6 +43,7 @@
 	/* Automatically stores in secure memory if DER data is secure */
 	sz = g_bytes_get_size (buf);
 	gcry = gcry_mpi_scan (mpi, GCRYMPI_FMT_STD, g_bytes_get_data (buf, NULL), sz, &sz);
+	g_bytes_unref (buf);
 	if (gcry != 0)
 		return FALSE;
 

=== modified file 'pkcs11/gkm/gkm-mock.c'
--- pkcs11/gkm/gkm-mock.c	2014-04-06 23:26:34 +0000
+++ pkcs11/gkm/gkm-mock.c	2015-02-27 19:55:06 +0000
@@ -72,6 +72,7 @@
 static guint unique_identifier = 100;
 static GHashTable *the_sessions = NULL;
 static GHashTable *the_objects = NULL;
+static GArray *the_credential_template = NULL;
 
 enum {
 	PRIVATE_KEY_CAPITALIZE = 3,
@@ -260,6 +261,7 @@
 	n_the_pin = strlen (the_pin);
 	the_sessions = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, free_session);
 	the_objects = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify)gkm_template_free);
+	the_credential_template = gkm_template_new (NULL, 0);
 
 	/* Our token object */
 	attrs = gkm_template_new (NULL, 0);
@@ -337,6 +339,9 @@
 	g_hash_table_destroy (the_sessions);
 	the_sessions = NULL;
 
+	gkm_template_free (the_credential_template);
+	the_credential_template = NULL;
+
 	g_free (the_pin);
 	return CKR_OK;
 }
@@ -679,9 +684,12 @@
 	g_return_val_if_fail (session, CKR_SESSION_HANDLE_INVALID);
 
 	old = g_strndup ((gchar*)pOldPin, ulOldLen);
-	if (!old || !g_str_equal (old, the_pin))
+	if (!old || !g_str_equal (old, the_pin)) {
+		g_free (old);
 		return CKR_PIN_INCORRECT;
+	}
 
+	g_free (old);
 	g_free (the_pin);
 	the_pin = g_strndup ((gchar*)pNewPin, ulNewLen);
 	n_the_pin = ulNewLen;
@@ -864,6 +872,10 @@
 
 	for (i = 0; i < ulCount; ++i) {
 		result = pTemplate + i;
+		if (result->type == CKA_G_CREDENTIAL_TEMPLATE) {
+			gkm_attribute_set_template (result, the_credential_template);
+			continue;
+		}
 		attr = gkm_template_find (attrs, result->type);
 		if (!attr) {
 			result->ulValueLen = (CK_ULONG)-1;
@@ -907,8 +919,22 @@
 		return CKR_OBJECT_HANDLE_INVALID;
 	}
 
-	for (i = 0; i < ulCount; ++i)
-		gkm_template_set (attrs, pTemplate + i);
+	for (i = 0; i < ulCount; ++i) {
+		CK_ATTRIBUTE_PTR attr = pTemplate + i;
+
+		if (attr->type == CKA_G_CREDENTIAL_TEMPLATE) {
+			CK_RV rv;
+			GArray *template;
+
+			rv = gkm_attribute_get_template (attr, &template);
+			if (rv != CKR_OK)
+				return CKR_OBJECT_HANDLE_INVALID;
+			gkm_template_free(the_credential_template);
+			the_credential_template = template;
+		} else {
+			gkm_template_set (attrs, attr);
+		}
+	}
 
 	return CKR_OK;
 }

=== modified file 'pkcs11/gkm/test-data-asn1.c'
--- pkcs11/gkm/test-data-asn1.c	2014-09-23 20:20:23 +0000
+++ pkcs11/gkm/test-data-asn1.c	2015-02-27 19:55:06 +0000
@@ -99,11 +99,14 @@
 	g_assert (asn != NULL);
 
 	ret = gkm_data_asn1_read_mpi (egg_asn1x_node (asn, "mpi", NULL), &mpt);
+	egg_asn1x_destroy (asn);
 	g_assert ("couldn't read mpi from asn1" && ret);
 	g_assert ("mpi returned is null" && mpt != NULL);
 	g_assert ("mpi is wrong number" && gcry_mpi_cmp (mpi, mpt) == 0);
 
 	g_bytes_unref (data);
+	gcry_mpi_release (mpi);
+	gcry_mpi_release (mpt);
 }
 
 int

=== modified file 'pkcs11/gkm/test-data-der.c'
--- pkcs11/gkm/test-data-der.c	2014-04-06 23:26:34 +0000
+++ pkcs11/gkm/test-data-der.c	2015-02-27 19:55:06 +0000
@@ -111,6 +111,7 @@
 	/* Now compare them */
 	g_assert ("key parsed differently" && compare_keys (key, sexp));
 
+	gcry_sexp_release (sexp);
 	g_bytes_unref (data);
 }
 
@@ -154,6 +155,8 @@
 	g_return_if_fail (gcry == 0);
 
 	test_der_public (key);
+
+	gcry_sexp_release (key);
 }
 
 static void
@@ -166,6 +169,8 @@
 	g_return_if_fail (gcry == 0);
 
 	test_der_public (key);
+
+	gcry_sexp_release (key);
 }
 
 static void
@@ -188,6 +193,7 @@
 	/* Now compare them */
 	g_assert ("key parsed differently" && compare_keys (key, sexp));
 
+	gcry_sexp_release (sexp);
 	g_bytes_unref (data);
 }
 
@@ -201,6 +207,8 @@
 	g_return_if_fail (gcry == 0);
 
 	test_der_private (key);
+
+	gcry_sexp_release (key);
 }
 
 static void
@@ -213,6 +221,8 @@
 	g_return_if_fail (gcry == 0);
 
 	test_der_private (key);
+
+	gcry_sexp_release (key);
 }
 
 static void
@@ -240,6 +250,7 @@
 	/* Now compare them */
 	g_assert ("key parsed differently" && compare_keys (skey, pkey));
 
+	gcry_sexp_release (skey);
 	g_bytes_unref (params);
 	g_bytes_unref (key);
 }
@@ -332,6 +343,8 @@
 
 	if (res == GKM_DATA_SUCCESS)
 		gcry_sexp_release (sexp);
+
+	egg_asn1x_destroy (asn1);
 	g_bytes_unref (keydata);
 }
 

=== modified file 'pkcs11/gkm/test-secret.c'
--- pkcs11/gkm/test-secret.c	2014-04-06 23:26:34 +0000
+++ pkcs11/gkm/test-secret.c	2015-02-27 19:55:06 +0000
@@ -185,6 +185,9 @@
 	g_object_unref (one);
 	one = gkm_secret_new_from_password ("other");
 	g_assert (!gkm_secret_equal (one, two));
+
+	g_object_unref (one);
+	g_object_unref (two);
 }
 
 int

=== modified file 'pkcs11/gkm/test-sexp.c'
--- pkcs11/gkm/test-sexp.c	2014-04-06 23:26:34 +0000
+++ pkcs11/gkm/test-sexp.c	2015-02-27 19:55:06 +0000
@@ -95,10 +95,12 @@
 	g_assert (algorithm == GCRY_PK_RSA);
 	g_assert (is_priv == TRUE);
 	g_assert (sexp != NULL);
+	gcry_sexp_release (sexp);
 
 	ret = gkm_sexp_extract_mpi (test->rsakey, &mpi, "p", NULL);
 	g_assert (ret);
 	g_assert (mpi != NULL);
+	gcry_mpi_release (mpi);
 }
 
 static void

=== modified file 'pkcs11/gnome2-store/gkm-gnome2-file.c'
--- pkcs11/gnome2-store/gkm-gnome2-file.c	2014-12-06 18:47:09 +0000
+++ pkcs11/gnome2-store/gkm-gnome2-file.c	2015-02-27 19:55:06 +0000
@@ -127,7 +127,7 @@
 static GHashTable*
 entries_new (void)
 {
-	return g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify)g_hash_table_unref);
+	return g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_hash_table_unref);
 }
 
 static gboolean
@@ -309,6 +309,7 @@
 	gsize n_hash, hash_offset;
 	guint32 length;
 	int algo;
+	gboolean valid;
 
 	g_assert (buffer);
 	g_assert (offset);
@@ -337,10 +338,10 @@
 
 	check = g_malloc0 (n_hash);
 	gcry_md_hash_buffer (algo, check, buffer->buf, length);
-	if (memcmp (check, hash, n_hash) != 0)
-		return FALSE;
+	valid = (memcmp (check, hash, n_hash) == 0);
+	g_free (check);
 
-	return TRUE;
+	return valid;
 }
 
 static gboolean
@@ -362,31 +363,24 @@
 	n_block = gcry_cipher_get_algo_blklen (calgo);
 	g_return_val_if_fail (n_block, FALSE);
 
-	/* Allocate memory for the keys */
-	key = gcry_malloc_secure (n_key);
-	g_return_val_if_fail (key, FALSE);
-	iv = g_malloc0 (n_block);
-
 	password = gkm_secret_get_password (login, &n_password);
 
 	if (!egg_symkey_generate_simple (calgo, halgo, password, n_password,
 	                                 salt, n_salt, iterations, &key, &iv)) {
-		gcry_free (key);
-		g_free (iv);
 		return FALSE;
 	}
 
 	gcry = gcry_cipher_open (cipher, calgo, GCRY_CIPHER_MODE_CBC, 0);
 	if (gcry) {
 		g_warning ("couldn't create cipher context: %s", gcry_strerror (gcry));
-		gcry_free (key);
+		egg_secure_free (key);
 		g_free (iv);
 		return FALSE;
 	}
 
 	gcry = gcry_cipher_setkey (*cipher, key, n_key);
 	g_return_val_if_fail (!gcry, FALSE);
-	gcry_free (key);
+	egg_secure_free (key);
 
 	gcry = gcry_cipher_setiv (*cipher, iv, n_block);
 	g_return_val_if_fail (!gcry, FALSE);

=== modified file 'pkcs11/gnome2-store/gkm-gnome2-storage.c'
--- pkcs11/gnome2-store/gkm-gnome2-storage.c	2014-12-06 18:47:09 +0000
+++ pkcs11/gnome2-store/gkm-gnome2-storage.c	2015-02-27 19:55:06 +0000
@@ -916,6 +916,10 @@
 		g_object_unref (self->manager);
 	self->manager = NULL;
 
+	if (self->login)
+		g_object_unref (self->login);
+	self->login = NULL;
+
 	g_signal_handlers_disconnect_by_func (self->file, data_file_entry_added, self);
 	g_signal_handlers_disconnect_by_func (self->file, data_file_entry_changed, self);
 	g_signal_handlers_disconnect_by_func (self->file, data_file_entry_removed, self);

=== modified file 'pkcs11/gnome2-store/test-import.c'
--- pkcs11/gnome2-store/test-import.c	2014-04-06 23:26:34 +0000
+++ pkcs11/gnome2-store/test-import.c	2015-02-27 19:55:06 +0000
@@ -62,6 +62,7 @@
 
 	test->funcs = gkm_gnome2_store_get_functions ();
 	rv = (test->funcs->C_Initialize) (&args);
+	g_free (args.pReserved);
 	gkm_assert_cmprv (rv, ==, CKR_OK);
 
 	/* And now need to log in */

=== modified file 'pkcs11/secret-store/gkm-secret-item.c'
--- pkcs11/secret-store/gkm-secret-item.c	2014-04-06 23:26:34 +0000
+++ pkcs11/secret-store/gkm-secret-item.c	2015-02-27 19:55:06 +0000
@@ -391,6 +391,9 @@
 		g_hash_table_unref (self->fields);
 	self->fields = NULL;
 
+	g_free (self->schema);
+	self->schema = NULL;
+
 	G_OBJECT_CLASS (gkm_secret_item_parent_class)->finalize (obj);
 }
 

=== modified file 'pkcs11/secret-store/gkm-secret-search.c'
--- pkcs11/secret-store/gkm-secret-search.c	2014-12-06 18:47:09 +0000
+++ pkcs11/secret-store/gkm-secret-search.c	2015-02-27 19:55:06 +0000
@@ -247,6 +247,7 @@
 	                       "schema-name", schema_name,
 	                       "collection-id", identifier,
 	                       NULL);
+	g_free (identifier);
 
 	/* Load any new items or collections */
 	gkm_module_refresh_token (module);

=== modified file 'pkcs11/secret-store/gkm-secret-textual.c'
--- pkcs11/secret-store/gkm-secret-textual.c	2014-12-06 18:47:09 +0000
+++ pkcs11/secret-store/gkm-secret-textual.c	2015-02-27 19:55:06 +0000
@@ -118,6 +118,7 @@
 		g_free (groupname);
 		++index;
 	}
+	g_list_free (names);
 }
 
 static void

=== modified file 'pkcs11/secret-store/test-secret-binary.c'
--- pkcs11/secret-store/test-secret-binary.c	2014-04-06 23:26:34 +0000
+++ pkcs11/secret-store/test-secret-binary.c	2015-02-27 19:55:06 +0000
@@ -156,6 +156,7 @@
 	/* Try parsing it again */
 	res = gkm_secret_binary_read (test->collection, test->sdata, data, n_data);
 	g_assert (res == GKM_DATA_SUCCESS);
+	g_free (data);
 }
 
 static void

=== modified file 'pkcs11/secret-store/test-secret-textual.c'
--- pkcs11/secret-store/test-secret-textual.c	2014-04-06 23:26:34 +0000
+++ pkcs11/secret-store/test-secret-textual.c	2015-02-27 19:55:06 +0000
@@ -148,6 +148,7 @@
 	/* Try parsing it again */
 	res = gkm_secret_textual_read (test->collection, test->sdata, data, n_data);
 	g_assert (res == GKM_DATA_SUCCESS);
+	g_free (data);
 }
 
 static void

=== modified file 'pkcs11/wrap-layer/gkm-wrap-prompt.c'
--- pkcs11/wrap-layer/gkm-wrap-prompt.c	2014-04-06 23:26:34 +0000
+++ pkcs11/wrap-layer/gkm-wrap-prompt.c	2015-02-27 19:55:06 +0000
@@ -904,14 +904,30 @@
 }
 
 static void
-gkm_wrap_prompt_finalize (GObject *obj)
+gkm_wrap_prompt_clear_prompt_data (GkmWrapPrompt *self)
 {
-	GkmWrapPrompt *self = GKM_WRAP_PROMPT (obj);
-
 	if (self->destroy_data && self->prompt_data)
 		(self->destroy_data) (self->prompt_data);
 	self->destroy_data = NULL;
 	self->prompt_data = NULL;
+}
+
+static void
+gkm_wrap_prompt_set_prompt_data (GkmWrapPrompt *self,
+				 gpointer prompt_data,
+				 GDestroyNotify destroy_data)
+{
+	gkm_wrap_prompt_clear_prompt_data (self);
+	self->destroy_data = destroy_data;
+	self->prompt_data = prompt_data;
+}
+
+static void
+gkm_wrap_prompt_finalize (GObject *obj)
+{
+	GkmWrapPrompt *self = GKM_WRAP_PROMPT (obj);
+
+	gkm_wrap_prompt_clear_prompt_data (self);
 
 	while (!g_queue_is_empty(&self->pool))
 		g_free (g_queue_pop_head (&self->pool));
@@ -934,7 +950,7 @@
 typedef struct _CredentialPrompt {
 	GArray *template;
 	CK_ULONG n_template;
-	const gchar *password;
+	gchar *password;
 } CredentialPrompt;
 
 static void
@@ -942,6 +958,7 @@
 {
 	CredentialPrompt *data = user_data;
 	g_array_free (data->template, TRUE);
+	egg_secure_strfree (data->password);
 	g_slice_free (CredentialPrompt, data);
 }
 
@@ -977,8 +994,8 @@
 	                     NULL);
 
 	/* Build up the prompt */
-	self->prompt_data = data = g_slice_new0 (CredentialPrompt);
-	self->destroy_data = credential_prompt_free;
+	data = g_slice_new0 (CredentialPrompt);
+	gkm_wrap_prompt_set_prompt_data (self, data, credential_prompt_free);
 	self->module = module;
 	self->session = session;
 	self->object = object;
@@ -1017,6 +1034,7 @@
 	attrs = get_attributes_from_object (self, &n_attrs);
 	g_return_val_if_fail (attrs, FALSE);
 
+	egg_secure_strfree (data->password);
 	data->password = NULL;
 
 	if (self->iteration == 0) {
@@ -1028,6 +1046,7 @@
 	}
 
 	if (!data->password) {
+		const char *password;
 		setup_unlock_prompt (self, attrs, n_attrs, self->iteration == 1);
 
 		/* Now load up the unlock options into the prompt*/
@@ -1039,14 +1058,15 @@
 
 		++(self->iteration);
 
-		data->password = gkm_wrap_prompt_request_password (self);
-		if (data->password == NULL) {
+		password = gkm_wrap_prompt_request_password (self);
+		if (password == NULL) {
 			if (error != NULL) {
 				g_warning ("couldn't prompt for password: %s", egg_error_message (error));
 				g_error_free (error);
 			}
 			return FALSE;
 		}
+		data->password = egg_secure_strdup (password);
 	}
 
 	/* Truncate any extra options off the end of template */
@@ -1173,7 +1193,7 @@
                              CK_UTF8CHAR_PTR *pin, CK_ULONG *n_pin)
 {
 	CK_TOKEN_INFO tinfo;
-	const gchar *password;
+	gchar *password;
 
 	g_assert (GKM_IS_WRAP_PROMPT (self));
 	g_assert (self->module);
@@ -1185,11 +1205,12 @@
 
 	setup_init_token (self, &tinfo);
 
-	password = gkm_wrap_prompt_request_password (self);
+	password = (char *)gkm_wrap_prompt_request_password (self);
 	if (password == NULL)
 		return FALSE;
 
-	self->prompt_data = (gpointer)password;
+	g_assert (self->destroy_data == NULL);
+	gkm_wrap_prompt_set_prompt_data (self, password, NULL);
 	*pin = (gpointer)password;
 	*n_pin = strlen (password);
 	return TRUE;
@@ -1314,8 +1335,9 @@
 	/* Build up the prompt */
 	self->module = module;
 	self->session = session;
-	self->destroy_data = set_pin_prompt_free;
-	self->prompt_data = g_slice_new0 (SetPinPrompt);
+	gkm_wrap_prompt_set_prompt_data (self,
+					 g_slice_new0 (SetPinPrompt),
+					 set_pin_prompt_free);
 
 	return self;
 }
@@ -1438,7 +1460,7 @@
 login_prompt_do_specific (GkmWrapPrompt *self, CK_RV last_result,
                           CK_UTF8CHAR_PTR *pin, CK_ULONG *n_pin)
 {
-	const gchar *password = NULL;
+	gchar *password = NULL;
 	CK_ATTRIBUTE_PTR attrs;
 	CK_ULONG n_attrs;
 
@@ -1451,6 +1473,9 @@
 	if (self->iteration == 0) {
 		++(self->iteration);
 		password = auto_unlock_lookup_object (attrs, n_attrs);
+		if (password)
+			gkm_wrap_prompt_set_prompt_data (self, password,
+							 (GDestroyNotify)egg_secure_strfree);
 
 	} else if (self->iteration == 1 && last_result == CKR_PIN_INCORRECT) {
 		auto_unlock_remove_object (attrs, n_attrs);
@@ -1459,12 +1484,12 @@
 	if (!password) {
 		setup_unlock_prompt (self, attrs, n_attrs, self->iteration == 1);
 
-		password = gkm_wrap_prompt_request_password (self);
+		password = (char *)gkm_wrap_prompt_request_password (self);
 		if (password == NULL)
 			return FALSE;
+		gkm_wrap_prompt_set_prompt_data (self, password, NULL);
 	}
 
-	self->prompt_data = (gpointer)password;
 	*pin = (guchar *)password;
 	*n_pin = strlen (password);
 	return TRUE;
@@ -1477,7 +1502,8 @@
 	CK_ULONG n_attrs;
 
 	g_assert (GKM_IS_WRAP_PROMPT (self));
-	g_assert (self->destroy_data == NULL);
+	g_assert (self->destroy_data == NULL ||
+		  self->destroy_data == (GDestroyNotify)egg_secure_strfree);
 
 	/* Possibly save away auto unlock */
 	if (call_result == CKR_OK && auto_unlock_should_attach (self)) {
@@ -1510,7 +1536,7 @@
                        CK_UTF8CHAR_PTR *pin, CK_ULONG *n_pin)
 {
 	CK_TOKEN_INFO tinfo;
-	const gchar *password = NULL;
+	gchar *password = NULL;
 
 	g_assert (GKM_IS_WRAP_PROMPT (self));
 	g_assert (self->module);
@@ -1523,6 +1549,9 @@
 	if (self->iteration == 0) {
 		++(self->iteration);
 		password = auto_unlock_lookup_token (&tinfo);
+		if (password)
+			gkm_wrap_prompt_set_prompt_data (self, password,
+							 (GDestroyNotify)egg_secure_strfree);
 
 	} else if (self->iteration == 1 && last_result == CKR_PIN_INCORRECT) {
 		auto_unlock_remove_token (&tinfo);
@@ -1531,12 +1560,12 @@
 	if (!password) {
 		setup_unlock_token (self, &tinfo);
 
-		password = gkm_wrap_prompt_request_password (self);
+		password = (char *)gkm_wrap_prompt_request_password (self);
 		if (password == NULL)
 			return FALSE;
+		gkm_wrap_prompt_set_prompt_data (self, password, NULL);
 	}
 
-	self->prompt_data = (gpointer)password;
 	*pin = (guchar *)password;
 	*n_pin = strlen (password);
 	return TRUE;
@@ -1548,7 +1577,8 @@
 	CK_TOKEN_INFO tinfo;
 
 	g_assert (GKM_IS_WRAP_PROMPT (self));
-	g_assert (self->destroy_data == NULL);
+	g_assert (self->destroy_data == NULL ||
+		  self->destroy_data == (GDestroyNotify)egg_secure_strfree);
 
 	/* Save the options, and possibly auto unlock */
 	if (call_result == CKR_OK && auto_unlock_should_attach (self)) {

=== modified file 'pkcs11/wrap-layer/mock-secret-store.c'
--- pkcs11/wrap-layer/mock-secret-store.c	2014-04-06 23:26:34 +0000
+++ pkcs11/wrap-layer/mock-secret-store.c	2015-02-27 19:55:06 +0000
@@ -207,7 +207,7 @@
 	rv = gkm_mock_C_CreateObject (hSession, pTemplate, ulCount, phObject);
 
 	if (template)
-		g_array_free (template, TRUE);
+		gkm_template_free (template);
 
 	return rv;
 }

=== modified file 'pkcs11/xdg-store/gkm-xdg-assertion.c'
--- pkcs11/xdg-store/gkm-xdg-assertion.c	2014-12-06 18:47:09 +0000
+++ pkcs11/xdg-store/gkm-xdg-assertion.c	2015-02-27 19:55:06 +0000
@@ -173,6 +173,8 @@
 	                          "purpose", purpose,
 	                          "peer", peer,
 	                          NULL);
+	g_free (purpose);
+	g_free (peer);
 
 	/* Add the assertion to the trust object */
 	if (!gkm_transaction_get_failed (transaction)) {

=== modified file 'pkcs11/xdg-store/gkm-xdg-trust.c'
--- pkcs11/xdg-store/gkm-xdg-trust.c	2014-04-06 23:26:34 +0000
+++ pkcs11/xdg-store/gkm-xdg-trust.c	2015-02-27 19:55:06 +0000
@@ -371,7 +371,7 @@
 		key = create_assertion_key (gkm_assertion_get_purpose (assertion),
 		                            gkm_assertion_get_peer (assertion));
 		g_object_set_qdata_full (G_OBJECT (assertion), QDATA_ASSERTION_KEY,
-		                         g_bytes_ref (key), (GDestroyNotify)g_bytes_unref);
+		                         key, (GDestroyNotify)g_bytes_unref);
 	}
 
 	return key;
@@ -439,6 +439,7 @@
 		if (!g_hash_table_steal (self->pv->assertions, key))
 			g_return_if_reached ();
 		gkm_transaction_add (transaction, self, complete_remove_assertion, assertion);
+		g_bytes_unref (key);
 	}
 }
 
@@ -706,6 +707,10 @@
 		g_hash_table_destroy (self->pv->assertions);
 	self->pv->assertions = NULL;
 
+	if (self->pv->bytes)
+		g_bytes_unref (self->pv->bytes);
+	self->pv->bytes = NULL;
+
 	G_OBJECT_CLASS (gkm_xdg_trust_parent_class)->finalize (obj);
 }
 
@@ -875,7 +880,6 @@
 		remove_assertion_from_trust (self, previous, transaction);
 	add_assertion_to_trust (self, assertion, transaction);
 
-	g_bytes_unref (key);
 }
 
 void

=== modified file 'pkcs11/xdg-store/test-xdg-module.c'
--- pkcs11/xdg-store/test-xdg-module.c	2014-04-06 23:26:34 +0000
+++ pkcs11/xdg-store/test-xdg-module.c	2015-02-27 19:55:06 +0000
@@ -190,6 +190,7 @@
 	rv = gkm_session_C_CreateObject (test->session, attrs, G_N_ELEMENTS (attrs), &object);
 	gkm_assert_cmprv (rv, ==, CKR_OK);
 	gkm_assert_cmpulong (object, !=, 0);
+	g_free (data);
 }
 
 static void

=== modified file 'pkcs11/xdg-store/test-xdg-trust.c'
--- pkcs11/xdg-store/test-xdg-trust.c	2014-04-06 23:26:34 +0000
+++ pkcs11/xdg-store/test-xdg-trust.c	2015-02-27 19:55:06 +0000
@@ -656,6 +656,7 @@
 	n_checksum = sizeof (checksum);
 	g_checksum_get_digest (md, checksum, &n_checksum);
 	g_assert (n_checksum == sizeof (checksum));
+	g_checksum_free (md);
 
 	rv = gkm_session_C_FindObjectsInit (test->session, lookup, G_N_ELEMENTS (lookup));
 	gkm_assert_cmprv (rv, ==, CKR_OK);

=== modified file 'po/LINGUAS'
--- po/LINGUAS	2014-04-06 23:26:34 +0000
+++ po/LINGUAS	2015-02-27 19:55:06 +0000
@@ -42,6 +42,7 @@
 it
 ja
 ka
+kk
 km
 kn
 ko

=== added file 'po/kk.po'
--- po/kk.po	1970-01-01 00:00:00 +0000
+++ po/kk.po	2015-02-27 19:55:06 +0000
@@ -0,0 +1,572 @@
+# Kazakh translation for gnome-keyring.
+# Copyright (C) 2014 gnome-keyring's COPYRIGHT HOLDER
+# This file is distributed under the same license as the gnome-keyring package.
+# Baurzhan Muftakhidinov <[e-mail]>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-keyring master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"keyring&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-10-28 07:44+0000\n"
+"PO-Revision-Date: 2014-10-28 17:27+0600\n"
+"Last-Translator: Baurzhan Muftakhidinov <[e-mail]>\n"
+"Language-Team: Kazakh <[e-mail]>\n"
+"Language: kk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.9\n"
+
+#. TRANSLATORS: This is the label for an keyring created without a label
+#: ../daemon/dbus/gkd-secret-change.c:85
+#: ../daemon/dbus/gkd-secret-change.c:121
+#: ../daemon/dbus/gkd-secret-create.c:78
+#: ../pkcs11/secret-store/gkm-secret-collection.c:324
+#: ../pkcs11/wrap-layer/gkm-wrap-login.c:345
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:753
+msgid "Unnamed"
+msgstr "Атаусыз"
+
+#: ../daemon/dbus/gkd-secret-change.c:90
+#, c-format
+msgid "Enter the old password for the '%s' keyring"
+msgstr "'%s' кілттер бауы үшін ескі парольді енгізіңіз"
+
+#: ../daemon/dbus/gkd-secret-change.c:94
+#, c-format
+msgid ""
+"An application wants to change the password for the '%s' keyring. Enter the "
+"old password for it."
+msgstr ""
+"Қолданба '%s' кілттер бауы үшін парольді өзгерткісі келеді. Ол үшін ескі "
+"парольді енгізіңіз."
+
+#: ../daemon/dbus/gkd-secret-change.c:100
+#: ../daemon/dbus/gkd-secret-change.c:136
+#: ../daemon/dbus/gkd-secret-change.c:147
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1143
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1255
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1290
+msgid "Continue"
+msgstr "Жалғастыру"
+
+#: ../daemon/dbus/gkd-secret-change.c:126
+#, c-format
+msgid "Choose a new password for the '%s' keyring"
+msgstr "'%s' кілттер бауы үшін жаңа парольді таңдаңыз"
+
+#: ../daemon/dbus/gkd-secret-change.c:130
+#, c-format
+msgid ""
+"An application wants to change the password for the '%s' keyring. Choose the "
+"new password you want to use for it."
+msgstr ""
+"Қолданба '%s' кілттер бауы үшін парольді өзгерткісі келеді. Қолданғыңыз "
+"келетін жаңа парольді енгізіңіз."
+
+#: ../daemon/dbus/gkd-secret-change.c:143
+#: ../daemon/dbus/gkd-secret-create.c:94
+msgid "Store passwords unencrypted?"
+msgstr "Парольдерді шифрленбеген түрде сақтау керек пе?"
+
+#: ../daemon/dbus/gkd-secret-change.c:145
+#: ../daemon/dbus/gkd-secret-create.c:96
+msgid ""
+"By choosing to use a blank password, your stored passwords will not be "
+"safely encrypted. They will be accessible by anyone with access to your "
+"files."
+msgstr ""
+"Бос парольді таңдасаңыз, сақталған парольдер шифрленбейтін болады. Яғни, "
+"сіздің файлдарыңызды оқи алатын адам парольдеріңізді де оқи алатын болады."
+
+#: ../daemon/dbus/gkd-secret-change.c:153
+msgid "The original password was incorrect"
+msgstr "Бастапқы паролі қате болды"
+
+#: ../daemon/dbus/gkd-secret-change.c:354
+msgid "Change Keyring Password"
+msgstr "Кілттер бауының паролін өзгерту"
+
+#: ../daemon/dbus/gkd-secret-create.c:80
+#, c-format
+msgid ""
+"An application wants to create a new keyring called '%s'. Choose the "
+"password you want to use for it."
+msgstr ""
+"Қолданба жаңа '%s' кілттер бауын жасағысы келеді. Қолданғыңыз келетін жаңа "
+"парольді енгізіңіз."
+
+#: ../daemon/dbus/gkd-secret-create.c:84
+msgid "Choose password for new keyring"
+msgstr "Кілттер бауы үшін жаңа парольді таңдаңыз"
+
+#: ../daemon/dbus/gkd-secret-create.c:311
+msgid "New Keyring Password"
+msgstr "Кілттер бауының жаңа паролі"
+
+#: ../daemon/gnome-keyring-gpg.desktop.in.in.h:1
+msgid "GPG Password Agent"
+msgstr "GPG парольдер агенті"
+
+#: ../daemon/gnome-keyring-gpg.desktop.in.in.h:2
+msgid "GNOME Keyring: GPG Agent"
+msgstr "GNOME Keyring: GPG агенті"
+
+#: ../daemon/gnome-keyring-pkcs11.desktop.in.in.h:1
+msgid "Certificate and Key Storage"
+msgstr "Сертификаттар және кілттер қоймасы"
+
+#: ../daemon/gnome-keyring-pkcs11.desktop.in.in.h:2
+msgid "GNOME Keyring: PKCS#11 Component"
+msgstr "GNOME Keyring: PKCS#11 құрамасы"
+
+#: ../daemon/gnome-keyring-secrets.desktop.in.in.h:1
+msgid "Secret Storage Service"
+msgstr "Құпия кілттер қоймасы қызметі"
+
+#: ../daemon/gnome-keyring-secrets.desktop.in.in.h:2
+msgid "GNOME Keyring: Secret Service"
+msgstr "GNOME Keyring: Құпия кілттер қызметі"
+
+#: ../daemon/gnome-keyring-ssh.desktop.in.in.h:1
+msgid "SSH Key Agent"
+msgstr "SSH кілттер агенті"
+
+#: ../daemon/gnome-keyring-ssh.desktop.in.in.h:2
+msgid "GNOME Keyring: SSH Agent"
+msgstr "GNOME Keyring: SSH агенті"
+
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:105
+msgid "Unknown"
+msgstr "Белгісіз"
+
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:202
+#, c-format
+msgid "PGP Key: %s"
+msgstr "PGP кілті: %s"
+
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:349
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:350
+msgid "Enter Passphrase"
+msgstr "Кілттік фразаны енгізіңіз"
+
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:354
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:602
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:630
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:645
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:721
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:767
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:799
+msgid "Unlock"
+msgstr "Босату"
+
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:383
+msgid "Automatically unlock this key, whenever I'm logged in"
+msgstr "Мен жүйеге кірген кезде, бұл кілтті автобосату"
+
+#. TRANSLATORS: This is the display label for the login keyring
+#: ../daemon/login/gkd-login.c:150
+msgid "Login"
+msgstr "Кіру"
+
+#: ../egg/dotlock.c:668
+#, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "`%s' уақытша файлын жасау сәтсіз: %s\n"
+
+#: ../egg/dotlock.c:718
+#, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "`%s' ішіне жазу қатесі: %s\n"
+
+#: ../egg/dotlock.c:782
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "`%s' жасау мүмкін емес: %s\n"
+
+#. Note: It is unlikley that we get a race here unless a pid is
+#. reused too fast or a new process with the same pid as the one
+#. of the stale file tries to lock right at the same time as we.
+#: ../egg/dotlock.c:1048
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr "ескірген блоктау файлын өшіру (жасаған %d)\n"
+
+#: ../egg/dotlock.c:1084
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "блоктауды күту (ұстап отырған %d%s) %s...\n"
+
+#: ../egg/dotlock.c:1085
+msgid "(deadlock?) "
+msgstr "(өзара блоктау?) "
+
+#: ../egg/dotlock.c:1124
+#, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "`%s' блоктауы жасалмады: %s\n"
+
+#: ../egg/dotlock.c:1150
+#, c-format
+msgid "waiting for lock %s...\n"
+msgstr "%s блоктауын күту...\n"
+
+#: ../egg/egg-oid.c:40
+msgid "Domain Component"
+msgstr "Домен құрамасы"
+
+#: ../egg/egg-oid.c:42
+msgid "User ID"
+msgstr "Пайдаланушы ID"
+
+#: ../egg/egg-oid.c:45
+msgid "Email Address"
+msgstr "Эл. пошта адресі"
+
+#: ../egg/egg-oid.c:53
+msgid "Date of Birth"
+msgstr "Туған күні"
+
+#: ../egg/egg-oid.c:55
+msgid "Place of Birth"
+msgstr "Туған жері"
+
+#: ../egg/egg-oid.c:57
+msgid "Gender"
+msgstr "Жынысы"
+
+#: ../egg/egg-oid.c:59
+msgid "Country of Citizenship"
+msgstr "Қай елдің азаматы"
+
+#: ../egg/egg-oid.c:61
+msgid "Country of Residence"
+msgstr "Тұрып жатқан ел"
+
+#: ../egg/egg-oid.c:64
+msgid "Common Name"
+msgstr "Жалпы аты"
+
+#: ../egg/egg-oid.c:66
+msgid "Surname"
+msgstr "Фамилия"
+
+#: ../egg/egg-oid.c:68
+msgid "Serial Number"
+msgstr "Сериялық нөмірі"
+
+#: ../egg/egg-oid.c:70
+msgid "Country"
+msgstr "Ел"
+
+#: ../egg/egg-oid.c:72
+msgid "Locality"
+msgstr "Аймақ"
+
+#: ../egg/egg-oid.c:74
+msgid "State"
+msgstr "Штат"
+
+#: ../egg/egg-oid.c:76
+msgid "Street"
+msgstr "Көше"
+
+#: ../egg/egg-oid.c:78
+msgid "Organization"
+msgstr "Ұйым"
+
+#: ../egg/egg-oid.c:80
+msgid "Organizational Unit"
+msgstr "Ұйым бөлімі"
+
+#: ../egg/egg-oid.c:82
+msgid "Title"
+msgstr "Атауы"
+
+#: ../egg/egg-oid.c:84
+msgid "Telephone Number"
+msgstr "Телефон нөмірі"
+
+#: ../egg/egg-oid.c:86
+msgid "Given Name"
+msgstr "Аты"
+
+#: ../egg/egg-oid.c:88
+msgid "Initials"
+msgstr "Инициалдар"
+
+#: ../egg/egg-oid.c:90
+msgid "Generation Qualifier"
+msgstr "Ұрпақ белгісі"
+
+#: ../egg/egg-oid.c:92
+msgid "DN Qualifier"
+msgstr "Айыру атының белгісі"
+
+#: ../egg/egg-oid.c:94
+msgid "Pseudonym"
+msgstr "Псевдоним"
+
+#: ../egg/egg-oid.c:97
+msgid "RSA"
+msgstr "RSA"
+
+#: ../egg/egg-oid.c:98
+msgid "MD2 with RSA"
+msgstr "RSA қолданатын MD2"
+
+#: ../egg/egg-oid.c:99
+msgid "MD5 with RSA"
+msgstr "RSA қолданатын MD5"
+
+#: ../egg/egg-oid.c:100
+msgid "SHA1 with RSA"
+msgstr "RSA қолданатын SHA1 "
+
+#: ../egg/egg-oid.c:102
+msgid "DSA"
+msgstr "DSA"
+
+#: ../egg/egg-oid.c:103
+msgid "SHA1 with DSA"
+msgstr "DSA қолданатын SHA1 "
+
+#. Extended Key Usages
+#: ../egg/egg-oid.c:106
+msgid "Server Authentication"
+msgstr "Сервер аутентификациясы"
+
+#: ../egg/egg-oid.c:107
+msgid "Client Authentication"
+msgstr "Клиент аутентификациясы"
+
+#: ../egg/egg-oid.c:108
+msgid "Code Signing"
+msgstr "Кодқа қолтаңба қою"
+
+#: ../egg/egg-oid.c:109
+msgid "Email Protection"
+msgstr "Эл. поштаны қорғау"
+
+#: ../egg/egg-oid.c:110
+msgid "Time Stamping"
+msgstr "Уақыт белгісі қою"
+
+#: ../egg/egg-spawn.c:272
+#, c-format
+msgid "Unexpected error in select() reading data from a child process (%s)"
+msgstr ""
+"Ұрпақ процестен мәліметті оқу кезінде select() ішіндегі күтпеген қате (%s)"
+
+#: ../egg/egg-spawn.c:319
+#, c-format
+msgid "Unexpected error in waitpid() (%s)"
+msgstr "Күтпеген waitpid() қатесі (%s)"
+
+#: ../pkcs11/gkm/gkm-certificate.c:580
+msgid "Unnamed Certificate"
+msgstr "Атаусыз сертификат"
+
+#: ../pkcs11/ssh-store/gkm-ssh-private-key.c:341
+msgid "Couldn't parse public SSH key"
+msgstr "Публикалық SSH кілтін талдау мүмкін емес"
+
+#. Get the label ready
+#: ../pkcs11/wrap-layer/gkm-wrap-login.c:345
+#, c-format
+msgid "Unlock password for: %s"
+msgstr "Босату паролі үшін: %s"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:590
+msgid "Unlock Login Keyring"
+msgstr "Жүйеге кіру кілттер бауын босату"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:592
+msgid "Enter password to unlock your login keyring"
+msgstr "Жүйеге кіру кілттер бауын босату үшін парольді енгізіңіз"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:596
+msgid ""
+"The password you use to log in to your computer no longer matches that of "
+"your login keyring."
+msgstr ""
+"Компьютеріңізге кіру үшін қолданылатын пароль енді жүйеге кіру кілттер бауы "
+"паролімен сәйкес келмейді."
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:598
+msgid ""
+"The login keyring did not get unlocked when you logged into your computer."
+msgstr ""
+"Жүйеге кіру кілттер бауы сіз жүйеге кірген кезде блоктаудан босатылмады."
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:616
+msgid "Unlock Keyring"
+msgstr "Кілттер бауын босату"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:618
+#, c-format
+msgid "Enter password for keyring '%s' to unlock"
+msgstr "'%s' кілттер бауын блоктаудан босату үшін парольді енгізіңіз"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:622
+#, c-format
+msgid "An application wants access to the keyring '%s', but it is locked"
+msgstr ""
+"Қолданба '%s' кілттер бауына қатынау талабын жасағысы келеді, бірақ, ол "
+"блокталған"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:628
+msgid "Automatically unlock this keyring whenever I'm logged in"
+msgstr "Мен жүйеге кірген кезде, бұл кілттер бауын автобосату"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:639
+msgid "Unlock private key"
+msgstr "Жеке кілтті блоктаудан босату"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:641
+msgid "Unlock certificate"
+msgstr "Сертификатты блоктаудан босату"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:643
+msgid "Unlock public key"
+msgstr "Публикалық кілтті блоктаудан босату"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:654
+msgid "Enter password to unlock the private key"
+msgstr "Жеке кілтті блоктаудан босату үшін парольді енгізіңіз"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:656
+msgid "Enter password to unlock the certificate"
+msgstr "Сертификатты блоктаудан босату үшін парольді енгізіңіз"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:658
+msgid "Enter password to unlock the public key"
+msgstr "Публикалық кілтті босату үшін парольді енгізіңіз"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:660
+msgid "Enter password to unlock"
+msgstr "Блоктаудан босату үшін парольді енгізіңіз"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:670
+msgid "Automatically unlock this key whenever I'm logged in"
+msgstr "Мен жүйеге кірген кезде, бұл кілтті автобосату"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:672
+msgid "Automatically unlock this certificate whenever I'm logged in"
+msgstr "Мен жүйеге кірген кезде, бұл сертификатты автобосату"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:674
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:796
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1140
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1288
+msgid "Automatically unlock whenever I'm logged in"
+msgstr "Мен жүйеге кірген кезде, автобосату"
+
+#. TRANSLATORS: The private key is locked
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:685
+#, c-format
+msgid "An application wants access to the private key '%s', but it is locked"
+msgstr ""
+"Қолданба '%s' жеке кілтіне қатынау талабын жасағысы келеді, бірақ, ол "
+"блокталған"
+
+#. TRANSLATORS: The certificate is locked
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:688
+#, c-format
+msgid "An application wants access to the certificate '%s', but it is locked"
+msgstr ""
+"Қолданба '%s' сертификатына қатынау талабын жасағысы келеді, бірақ, ол "
+"блокталған"
+
+#. TRANSLATORS: The public key is locked
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:691
+#, c-format
+msgid "An application wants access to the public key '%s', but it is locked"
+msgstr ""
+"Қолданба '%s' публикалық кілтіне қатынау талабын жасағысы келеді, бірақ, ол "
+"блокталған"
+
+#. TRANSLATORS: The object '%s' is locked
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:694
+#, c-format
+msgid "An application wants access to '%s', but it is locked"
+msgstr ""
+"Қолданба '%s' үшін қатынау талабын жасағысы келеді, бірақ, ол блокталған"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:765
+msgid "The unlock password was incorrect"
+msgstr "Босату паролі қате болды"
+
+#. Build up the prompt
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:786
+msgid "Unlock certificate/key storage"
+msgstr "Сертификаттар/кілттер қоймасын блоктаудан босату"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:787
+msgid "Enter password to unlock the certificate/key storage"
+msgstr ""
+"Сертификаттар/кілттер қоймасын блоктаудан босату үшін парольді енгізіңіз"
+
+#. TRANSLATORS: The storage is locked, and needs unlocking before the application can use it.
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:790
+#, c-format
+msgid ""
+"An application wants access to the certificate/key storage '%s', but it is "
+"locked"
+msgstr ""
+"Қолданба '%s' сертификаттар/кілттер қоймасына қатынау талабын жасағысы "
+"келеді, бірақ, ол блокталған"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1131
+msgid "New Password Required"
+msgstr "Жаңа пароль керек"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1132
+msgid "New password required for secure storage"
+msgstr "Қауіпсіз қойма үшін жаңа пароль керек"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1134
+#, c-format
+msgid ""
+"In order to prepare '%s' for storage of certificates or keys, a password is "
+"required"
+msgstr ""
+"'%s' ішіне сертификаттар не кілттерді сақтауға дайындау үшін пароль керек"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1248
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1279
+msgid "Change Password"
+msgstr "Парольді өзгерту"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1249
+msgid "Original password for secure storage"
+msgstr "Қауіпсіз қойма үшін ескі паролі"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1251
+#, c-format
+msgid "To change the password for '%s', the original password is required"
+msgstr "'%s' паролін өзгерту үшін ескі паролі қажет"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1280
+msgid "Change password for secure storage"
+msgstr "Қауіпсіз қойма үшін парольді өзгерту"
+
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1282
+#, c-format
+msgid "Type a new password for '%s'"
+msgstr "'%s' үшін жаңа парольді енгізіңіз"
+
+#: ../tool/gkr-tool.c:100
+#, c-format
+msgid "usage: gnome-keyring command [options]\n"
+msgstr "қолданылуы: gnome-keyring команда [опциялар]\n"
+
+#: ../tool/gkr-tool.c:102
+msgid "commands: "
+msgstr "командалар: "
+
+#. Translators: keep same length as translated message "commands: "
+#: ../tool/gkr-tool.c:106
+msgid "          "
+msgstr "            "

=== modified file 'po/tr.po'
--- po/tr.po	2013-11-15 15:32:11 +0000
+++ po/tr.po	2015-02-27 19:55:06 +0000
@@ -8,15 +8,15 @@
 # Serdar CICEK <[e-mail]>, 2008.
 # Baris Cicek <[e-mail]>, 2008, 2009.
 # Osman Karagöz <[e-mail]>, 2013.
-# Muhammet Kara <[e-mail]>, 2011, 2013.
+# Muhammet Kara <[e-mail]>, 2011, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-keyring\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "keyring&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-26 16:32+0000\n"
-"PO-Revision-Date: 2013-09-01 13:11+0300\n"
+"POT-Creation-Date: 2014-12-06 19:51+0000\n"
+"PO-Revision-Date: 2014-12-07 00:18+0200\n"
 "Last-Translator: Muhammet Kara <[e-mail]>\n"
 "Language-Team: Türkçe <[e-mail]>\n"
 "Language: tr\n"
@@ -27,21 +27,21 @@
 "X-Generator: Gtranslator 2.91.6\n"
 
 #. TRANSLATORS: This is the label for an keyring created without a label
-#: ../daemon/dbus/gkd-secret-change.c:86
-#: ../daemon/dbus/gkd-secret-change.c:122
-#: ../daemon/dbus/gkd-secret-create.c:79
-#: ../pkcs11/secret-store/gkm-secret-collection.c:325
-#: ../pkcs11/wrap-layer/gkm-wrap-login.c:346
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:754
+#: ../daemon/dbus/gkd-secret-change.c:85
+#: ../daemon/dbus/gkd-secret-change.c:121
+#: ../daemon/dbus/gkd-secret-create.c:78
+#: ../pkcs11/secret-store/gkm-secret-collection.c:324
+#: ../pkcs11/wrap-layer/gkm-wrap-login.c:345
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:753
 msgid "Unnamed"
 msgstr "Adsız"
 
-#: ../daemon/dbus/gkd-secret-change.c:91
+#: ../daemon/dbus/gkd-secret-change.c:90
 #, c-format
 msgid "Enter the old password for the '%s' keyring"
 msgstr "'%s' anahtarlığı için eski parolayı girin"
 
-#: ../daemon/dbus/gkd-secret-change.c:95
+#: ../daemon/dbus/gkd-secret-change.c:94
 #, c-format
 msgid ""
 "An application wants to change the password for the '%s' keyring. Enter the "
@@ -50,21 +50,21 @@
 "Bir uygulama '%s' anahtarlığının parolasını değiştirmek istiyor. Bu "
 "anahtarlık için eski parolayı girin."
 
-#: ../daemon/dbus/gkd-secret-change.c:101
-#: ../daemon/dbus/gkd-secret-change.c:137
-#: ../daemon/dbus/gkd-secret-change.c:148
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1144
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1256
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1291
+#: ../daemon/dbus/gkd-secret-change.c:100
+#: ../daemon/dbus/gkd-secret-change.c:136
+#: ../daemon/dbus/gkd-secret-change.c:147
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1163
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1276
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1311
 msgid "Continue"
 msgstr "Devam"
 
-#: ../daemon/dbus/gkd-secret-change.c:127
+#: ../daemon/dbus/gkd-secret-change.c:126
 #, c-format
 msgid "Choose a new password for the '%s' keyring"
 msgstr "'%s' anahtarlığı için yeni bir parola belirleyin"
 
-#: ../daemon/dbus/gkd-secret-change.c:131
+#: ../daemon/dbus/gkd-secret-change.c:130
 #, c-format
 msgid ""
 "An application wants to change the password for the '%s' keyring. Choose the "
@@ -73,13 +73,13 @@
 "Bir uygulama '%s' anahtarlığının parolasını değiştirmek istiyor. Bu "
 "anahtarlık için kullanmak istediğiniz yeni parolayı seçin."
 
-#: ../daemon/dbus/gkd-secret-change.c:144
-#: ../daemon/dbus/gkd-secret-create.c:95
+#: ../daemon/dbus/gkd-secret-change.c:143
+#: ../daemon/dbus/gkd-secret-create.c:94
 msgid "Store passwords unencrypted?"
 msgstr "Parolalar şifrelenmeden depolansın mı?"
 
-#: ../daemon/dbus/gkd-secret-change.c:146
-#: ../daemon/dbus/gkd-secret-create.c:97
+#: ../daemon/dbus/gkd-secret-change.c:145
+#: ../daemon/dbus/gkd-secret-create.c:96
 msgid ""
 "By choosing to use a blank password, your stored passwords will not be "
 "safely encrypted. They will be accessible by anyone with access to your "
@@ -88,15 +88,15 @@
 "Parolayı boş kullanmak seçildiğinde, depolanan parolalarınız güvenli olarak "
 "şifrelenmeyecek. Parolalarınıza dosyalarınıza erişebilen kişiler erişecek."
 
-#: ../daemon/dbus/gkd-secret-change.c:154
+#: ../daemon/dbus/gkd-secret-change.c:153
 msgid "The original password was incorrect"
 msgstr "Asıl parola yanlış"
 
-#: ../daemon/dbus/gkd-secret-change.c:355
+#: ../daemon/dbus/gkd-secret-change.c:354
 msgid "Change Keyring Password"
 msgstr "Anahtarlık Parolası Değiştir"
 
-#: ../daemon/dbus/gkd-secret-create.c:81
+#: ../daemon/dbus/gkd-secret-create.c:80
 #, c-format
 msgid ""
 "An application wants to create a new keyring called '%s'. Choose the "
@@ -105,11 +105,11 @@
 "Bir uygulama '%s' adlı yeni bir anahtarlık oluşturmak istiyor. Bunun için "
 "kullanmak istediğiniz parolayı seçin."
 
-#: ../daemon/dbus/gkd-secret-create.c:85
+#: ../daemon/dbus/gkd-secret-create.c:84
 msgid "Choose password for new keyring"
 msgstr "Yeni anahtarlık için parola seçin"
 
-#: ../daemon/dbus/gkd-secret-create.c:312
+#: ../daemon/dbus/gkd-secret-create.c:311
 msgid "New Keyring Password"
 msgstr "Yeni Anahtarlık Parolası"
 
@@ -145,36 +145,36 @@
 msgid "GNOME Keyring: SSH Agent"
 msgstr "GNOME Anahtarlığı: SSH Aracı"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:106
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:82
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:203
-#, c-format
-msgid "PGP Key: %s"
-msgstr "PGP Anahtarı: %s"
-
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:350
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:351
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:144
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:145
 msgid "Enter Passphrase"
 msgstr "Parola Metnini Girin"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:355
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:603
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:631
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:646
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:722
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:768
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:800
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:149
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:602
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:630
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:645
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:721
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:767
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:799
 msgid "Unlock"
 msgstr "Kilidini kaldır"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:384
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:162
 msgid "Automatically unlock this key, whenever I'm logged in"
 msgstr "Her oturum açtığımda, bu anahtarın kilidini otomatik olarak aç"
 
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:225
+#, c-format
+msgid "PGP Key: %s"
+msgstr "PGP Anahtarı: %s"
+
 #. TRANSLATORS: This is the display label for the login keyring
-#: ../daemon/login/gkd-login.c:145
+#: ../daemon/login/gkd-login.c:158
 msgid "Login"
 msgstr "Giriş"
 
@@ -221,257 +221,256 @@
 msgid "waiting for lock %s...\n"
 msgstr "%s kilidi bekleniyor...\n"
 
-#: ../egg/egg-oid.c:41
+#: ../egg/egg-oid.c:40
 msgid "Domain Component"
 msgstr "Alan Bileşeni"
 
-#: ../egg/egg-oid.c:43
+#: ../egg/egg-oid.c:42
 msgid "User ID"
 msgstr "Kullanıcı ID"
 
-#: ../egg/egg-oid.c:46
+#: ../egg/egg-oid.c:45
 msgid "Email Address"
 msgstr "E-posta Adresi"
 
-#: ../egg/egg-oid.c:54
+#: ../egg/egg-oid.c:53
 msgid "Date of Birth"
 msgstr "Doğum Tarihi"
 
-#: ../egg/egg-oid.c:56
+#: ../egg/egg-oid.c:55
 msgid "Place of Birth"
 msgstr "Doğum Yeri"
 
-#: ../egg/egg-oid.c:58
+#: ../egg/egg-oid.c:57
 msgid "Gender"
 msgstr "Cinsiyet"
 
-#: ../egg/egg-oid.c:60
+#: ../egg/egg-oid.c:59
 msgid "Country of Citizenship"
 msgstr "Vatandaşlık Ülkesi"
 
-#: ../egg/egg-oid.c:62
+#: ../egg/egg-oid.c:61
 msgid "Country of Residence"
 msgstr "Yerleşim Ülkesi"
 
-#: ../egg/egg-oid.c:65
+#: ../egg/egg-oid.c:64
 msgid "Common Name"
 msgstr "Ortak Ad"
 
-#: ../egg/egg-oid.c:67
+#: ../egg/egg-oid.c:66
 msgid "Surname"
 msgstr "Soyadı"
 
-#: ../egg/egg-oid.c:69
+#: ../egg/egg-oid.c:68
 msgid "Serial Number"
 msgstr "Seri Numarası"
 
-#: ../egg/egg-oid.c:71
+#: ../egg/egg-oid.c:70
 msgid "Country"
 msgstr "Ülke"
 
-#: ../egg/egg-oid.c:73
+#: ../egg/egg-oid.c:72
 msgid "Locality"
 msgstr "Yöre"
 
-#: ../egg/egg-oid.c:75
+#: ../egg/egg-oid.c:74
 msgid "State"
 msgstr "Eyalet"
 
-#: ../egg/egg-oid.c:77
+#: ../egg/egg-oid.c:76
 msgid "Street"
 msgstr "Sokak"
 
-#: ../egg/egg-oid.c:79
+#: ../egg/egg-oid.c:78
 msgid "Organization"
 msgstr "Organizasyon"
 
-#: ../egg/egg-oid.c:81
+#: ../egg/egg-oid.c:80
 msgid "Organizational Unit"
 msgstr "Organizasyon Birimi"
 
-#: ../egg/egg-oid.c:83
+#: ../egg/egg-oid.c:82
 msgid "Title"
 msgstr "Başlık"
 
-#: ../egg/egg-oid.c:85
+#: ../egg/egg-oid.c:84
 msgid "Telephone Number"
 msgstr "Telefon Numarası"
 
-#: ../egg/egg-oid.c:87
+#: ../egg/egg-oid.c:86
 msgid "Given Name"
 msgstr "Verilen Ad"
 
-#: ../egg/egg-oid.c:89
+#: ../egg/egg-oid.c:88
 msgid "Initials"
 msgstr "Başharfleri"
 
-#: ../egg/egg-oid.c:91
+#: ../egg/egg-oid.c:90
 msgid "Generation Qualifier"
 msgstr "Üretim Belirteci"
 
-#: ../egg/egg-oid.c:93
+#: ../egg/egg-oid.c:92
 msgid "DN Qualifier"
 msgstr "DN Belirteci"
 
-#: ../egg/egg-oid.c:95
+#: ../egg/egg-oid.c:94
 msgid "Pseudonym"
 msgstr "Takma ad"
 
-#: ../egg/egg-oid.c:98
+#: ../egg/egg-oid.c:97
 msgid "RSA"
 msgstr "RSA"
 
-#: ../egg/egg-oid.c:99
+#: ../egg/egg-oid.c:98
 msgid "MD2 with RSA"
 msgstr "RSA ile MD2"
 
-#: ../egg/egg-oid.c:100
+#: ../egg/egg-oid.c:99
 msgid "MD5 with RSA"
 msgstr "RSA ile MD5"
 
-#: ../egg/egg-oid.c:101
+#: ../egg/egg-oid.c:100
 msgid "SHA1 with RSA"
 msgstr "RSA ile SHA1"
 
-#: ../egg/egg-oid.c:103
+#: ../egg/egg-oid.c:102
 msgid "DSA"
 msgstr "DSA"
 
-#: ../egg/egg-oid.c:104
+#: ../egg/egg-oid.c:103
 msgid "SHA1 with DSA"
 msgstr "DSA ile SHA1"
 
 #. Extended Key Usages
-#: ../egg/egg-oid.c:107
+#: ../egg/egg-oid.c:106
 msgid "Server Authentication"
 msgstr "Sunucu Kimlik Denetimi"
 
-#: ../egg/egg-oid.c:108
+#: ../egg/egg-oid.c:107
 msgid "Client Authentication"
 msgstr "İstemci Kimlik Denetimi"
 
-#: ../egg/egg-oid.c:109
+#: ../egg/egg-oid.c:108
 msgid "Code Signing"
 msgstr "Kod İmzalama"
 
-#: ../egg/egg-oid.c:110
+#: ../egg/egg-oid.c:109
 msgid "Email Protection"
 msgstr "E-posta Koruma"
 
-#: ../egg/egg-oid.c:111
+#: ../egg/egg-oid.c:110
 msgid "Time Stamping"
 msgstr "Zaman Damgalama"
 
-#: ../egg/egg-spawn.c:273
+#: ../egg/egg-spawn.c:272
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "Alt süreçten bilgi okurken select()'te beklenmeyen hata oluştu (%s)"
 
-#: ../egg/egg-spawn.c:320
+#: ../egg/egg-spawn.c:319
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "waitpid()'de beklenmedik hata oluştu(%s)"
 
-#: ../pkcs11/gkm/gkm-certificate.c:581
+#: ../pkcs11/gkm/gkm-certificate.c:580
 msgid "Unnamed Certificate"
 msgstr "İsimlendirilmemiş Sertifika"
 
-#: ../pkcs11/ssh-store/gkm-ssh-private-key.c:342
+#: ../pkcs11/ssh-store/gkm-ssh-private-key.c:341
 msgid "Couldn't parse public SSH key"
 msgstr "Genel SSH anahtarı ayrıştırılamadı"
 
 #. Get the label ready
-#: ../pkcs11/wrap-layer/gkm-wrap-login.c:346
+#: ../pkcs11/wrap-layer/gkm-wrap-login.c:345
 #, c-format
 msgid "Unlock password for: %s"
 msgstr "Şunun için kilit açma şifresi: %s"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:591
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:590
 msgid "Unlock Login Keyring"
 msgstr "Giriş Anahtarlık Kilidini Kaldır"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:593
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:592
 msgid "Enter password to unlock your login keyring"
 msgstr "Giriş anahtarlığınızı açmak için parolayı girin"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:597
-#, fuzzy
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:596
 msgid ""
 "The password you use to log in to your computer no longer matches that of "
 "your login keyring."
 msgstr ""
-"Bilgisayarınıza giriş yamak için kullandığınız şifre artık giriş "
+"Bilgisayarınıza giriş yapmak için kullandığınız parola artık giriş "
 "anahtarlığınızla uyuşmuyor."
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:599
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:598
 msgid ""
 "The login keyring did not get unlocked when you logged into your computer."
 msgstr "Giriş anahtarlığı, bilgisayarınıza giriş yaptığınızda açılmadı."
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:617
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:616
 msgid "Unlock Keyring"
 msgstr "Anahtarlık Kilidini Aç"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:619
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:618
 #, c-format
 msgid "Enter password for keyring '%s' to unlock"
 msgstr "'%s' anahtarlık kilidini açmak için parola girin"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:623
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:622
 #, c-format
 msgid "An application wants access to the keyring '%s', but it is locked"
 msgstr ""
 "Bir uygulama '%s' anahtarlığına erişmek istiyor, ancak anahtarlık kilitli"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:629
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:628
 msgid "Automatically unlock this keyring whenever I'm logged in"
 msgstr "Her oturum açtığımda, bu anahtarlığın kilidini otomatik olarak aç"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:640
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:639
 msgid "Unlock private key"
 msgstr "Özel anahtarın kilidini kaldır"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:642
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:641
 msgid "Unlock certificate"
 msgstr "Sertifikanın kilidini kaldır"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:644
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:643
 msgid "Unlock public key"
 msgstr "Genel anahtarın kilidini kaldır"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:655
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:654
 msgid "Enter password to unlock the private key"
 msgstr "Özel anahtarlık kilidini açmak için parola girin"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:657
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:656
 msgid "Enter password to unlock the certificate"
 msgstr "Sertifikanın kilidini açmak için parola girin"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:659
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:658
 msgid "Enter password to unlock the public key"
 msgstr "Genel anahtarlık kilidini açmak için parola girin"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:661
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:660
 msgid "Enter password to unlock"
 msgstr "Kilidini açmak için parola girin"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:671
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:670
 msgid "Automatically unlock this key whenever I'm logged in"
 msgstr "Her oturum açtığımda, bu anahtarın kilidini otomatik olarak aç"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:673
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:672
 msgid "Automatically unlock this certificate whenever I'm logged in"
 msgstr "Her oturum açtığımda, bu sertifikanın kilidini otomatik olarak aç"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:675
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:797
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1141
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1289
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:674
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:796
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1160
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1309
 msgid "Automatically unlock whenever I'm logged in"
 msgstr "Her oturum açtığımda, kilidi otomatik olarak aç"
 
 #. TRANSLATORS: The private key is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:686
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:685
 #, c-format
 msgid "An application wants access to the private key '%s', but it is locked"
 msgstr ""
@@ -479,7 +478,7 @@
 "anahtarlık kilitli"
 
 #. TRANSLATORS: The certificate is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:689
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:688
 #, c-format
 msgid "An application wants access to the certificate '%s', but it is locked"
 msgstr ""
@@ -487,7 +486,7 @@
 "kilitli"
 
 #. TRANSLATORS: The public key is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:692
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:691
 #, c-format
 msgid "An application wants access to the public key '%s', but it is locked"
 msgstr ""
@@ -495,28 +494,28 @@
 "anahtarlık kilitli"
 
 #. TRANSLATORS: The object '%s' is locked
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:695
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:694
 #, c-format
 msgid "An application wants access to '%s', but it is locked"
 msgstr ""
 "Bilinmeyen bir uygulama '%s' anahtarlığa ulaşmak istiyor, fakat anahtarlık "
 "kilitli"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:766
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:765
 msgid "The unlock password was incorrect"
 msgstr "Kilit açma parolası hatalı"
 
 #. Build up the prompt
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:787
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:786
 msgid "Unlock certificate/key storage"
 msgstr "Sertifika/anahtar deposu kilidini aç"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:788
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:787
 msgid "Enter password to unlock the certificate/key storage"
 msgstr "Sertifika/anahtar deposu kilidini açmak için parolanızı girin"
 
 #. TRANSLATORS: The storage is locked, and needs unlocking before the application can use it.
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:791
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:790
 #, c-format
 msgid ""
 "An application wants access to the certificate/key storage '%s', but it is "
@@ -524,15 +523,15 @@
 msgstr ""
 "Bir uygulama sertifika/anahtar deposu '%s' için erişim istiyor, ancak kilitli"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1132
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1151
 msgid "New Password Required"
 msgstr "Yeni Parola Gerekli"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1133
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1152
 msgid "New password required for secure storage"
 msgstr "Güvenli depolama için yeni parola gerekli"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1135
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1154
 #, c-format
 msgid ""
 "In order to prepare '%s' for storage of certificates or keys, a password is "
@@ -540,40 +539,40 @@
 msgstr ""
 "'%s' parola ya da anahtar depolamaya hazırlamak için bir parola gereklidir"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1249
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1280
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1269
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1300
 msgid "Change Password"
 msgstr "Parolayı Değiştir"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1250
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1270
 msgid "Original password for secure storage"
 msgstr "Güvenli depolama için asıl parola"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1252
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1272
 #, c-format
 msgid "To change the password for '%s', the original password is required"
 msgstr "'%s' parolasını değiştirmek için, asıl parola gereklidir"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1281
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1301
 msgid "Change password for secure storage"
 msgstr "Güvenli depolama için parolayı değiştir"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1283
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1303
 #, c-format
 msgid "Type a new password for '%s'"
 msgstr "'%s' için yeni bir parola yazın"
 
-#: ../tool/gkr-tool.c:102
+#: ../tool/gkr-tool.c:100
 #, c-format
 msgid "usage: gnome-keyring command [options]\n"
 msgstr "kullanımı: gnome-keyring komutu [seçenekler]\n"
 
-#: ../tool/gkr-tool.c:104
+#: ../tool/gkr-tool.c:102
 msgid "commands: "
 msgstr "komutlar: "
 
 #. Translators: keep same length as translated message "commands: "
-#: ../tool/gkr-tool.c:108
+#: ../tool/gkr-tool.c:106
 msgid "          "
 msgstr "          "
 

=== modified file 'po/vi.po'
--- po/vi.po	2012-09-04 09:25:05 +0000
+++ po/vi.po	2015-02-27 19:55:06 +0000
@@ -1,28 +1,32 @@
 # Vietnamese translation of GNOME Keyring.
-# Copyright © 2010 GNOME i18n Project for Vietnamese.
+# Copyright © 2014 GNOME i18n Project for Vietnamese.
+# This file is distributed under the same license as the gnome-keyring package.
 # Nguyễn Thái Ngọc Duy <[e-mail]>, 2004,2008,2011-2012.
 # Clytie Siddall <[e-mail]>, 2005-2010.
 # Nguyen Vu Hung <[e-mail]>, 2011.
+# Trần Ngọc Quân <[e-mail]>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-keyring 2.26.3\n"
+"Project-Id-Version: gnome-keyring master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "keyring&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-08 19:47+0000\n"
-"PO-Revision-Date: 2012-09-01 17:12+0700\n"
-"Last-Translator: Nguyễn Thái Ngọc Duy <[e-mail]>\n"
-"Language-Team: Vietnamese <[e-mail]>\n"
+"POT-Creation-Date: 2014-11-20 20:13+0000\n"
+"PO-Revision-Date: 2014-11-21 14:15+0700\n"
+"Last-Translator: Trần Ngọc Quân <[e-mail]>\n"
+"Language-Team: Vietnamese <[e-mail]>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.8\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #. TRANSLATORS: This is the label for an keyring created without a label
 #: ../daemon/dbus/gkd-secret-change.c:85
 #: ../daemon/dbus/gkd-secret-change.c:121
-#: ../daemon/dbus/gkd-secret-create.c:79
-#: ../pkcs11/secret-store/gkm-secret-collection.c:325
+#: ../daemon/dbus/gkd-secret-create.c:78
+#: ../pkcs11/secret-store/gkm-secret-collection.c:324
 #: ../pkcs11/wrap-layer/gkm-wrap-login.c:345
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:753
 msgid "Unnamed"
@@ -30,35 +34,31 @@
 
 #: ../daemon/dbus/gkd-secret-change.c:90
 #, c-format
-#| msgid "Choose a new password for the '%s' keyring"
 msgid "Enter the old password for the '%s' keyring"
-msgstr "Nhập mật khẩu cũ cho vòng khóa '%s'"
+msgstr "Nhập mật khẩu cũ cho chùm chìa khóa “%s”"
 
 #: ../daemon/dbus/gkd-secret-change.c:94
 #, c-format
-#| msgid ""
-#| "An application wants to change the password for the '%s' keyring. Choose "
-#| "the new password you want to use for it."
 msgid ""
 "An application wants to change the password for the '%s' keyring. Enter the "
 "old password for it."
 msgstr ""
-"Một ứng dụng muốn thay đổi mật khẫu cho vòng khoá '%s'. Nhập mật khẩu cũ của "
-"nó."
+"Một ứng dụng muốn thay đổi mật khẩu cho chùm chìa khóa “%s”. Nhập mật khẩu "
+"cũ của nó."
 
 #: ../daemon/dbus/gkd-secret-change.c:100
 #: ../daemon/dbus/gkd-secret-change.c:136
-#: ../daemon/dbus/gkd-secret-change.c:146
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1143
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1255
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1290
+#: ../daemon/dbus/gkd-secret-change.c:147
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1163
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1276
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1311
 msgid "Continue"
 msgstr "Tiếp tục"
 
 #: ../daemon/dbus/gkd-secret-change.c:126
 #, c-format
 msgid "Choose a new password for the '%s' keyring"
-msgstr "Hãy chọn một mật khẩu mới cho vòng khóa '%s'"
+msgstr "Hãy chọn một mật khẩu mới cho chùm chìa khóa “%s”"
 
 #: ../daemon/dbus/gkd-secret-change.c:130
 #, c-format
@@ -66,48 +66,48 @@
 "An application wants to change the password for the '%s' keyring. Choose the "
 "new password you want to use for it."
 msgstr ""
-"Một ứng dụng muốn thay đổi mật khẫu cho vòng khoá '%s'. Hãy chọn mật khẩu "
-"cần sử dụng với nó."
+"Một ứng dụng muốn thay đổi mật khẫu cho chùm chìa khóa “%s”. Hãy chọn mật "
+"khẩu cần sử dụng với nó."
 
-#: ../daemon/dbus/gkd-secret-change.c:142
-#: ../daemon/dbus/gkd-secret-create.c:95
+#: ../daemon/dbus/gkd-secret-change.c:143
+#: ../daemon/dbus/gkd-secret-create.c:94
 msgid "Store passwords unencrypted?"
-msgstr "Lưu mật khẩu không mật mã không?"
+msgstr "Lưu mật khẩu không mã hóa không?"
 
-#: ../daemon/dbus/gkd-secret-change.c:144
-#: ../daemon/dbus/gkd-secret-create.c:97
+#: ../daemon/dbus/gkd-secret-change.c:145
+#: ../daemon/dbus/gkd-secret-create.c:96
 msgid ""
 "By choosing to use a blank password, your stored passwords will not be "
 "safely encrypted. They will be accessible by anyone with access to your "
 "files."
 msgstr ""
-"Dùng một mật khẩu trắng thì mật khẩu đã lưu sẽ không thể được mã hoá an "
-"toàn. Mọi người đều có thể truy cập vào tập tin của bạn."
+"Dùng một mật khẩu trắng thì mật khẩu đã lưu sẽ không được mã hoá an toàn. "
+"Mọi người đều có thể truy cập vào tập tin của bạn."
 
-#: ../daemon/dbus/gkd-secret-change.c:152
+#: ../daemon/dbus/gkd-secret-change.c:153
 msgid "The original password was incorrect"
 msgstr "Bạn đã gõ sai mật khẩu gốc"
 
-#: ../daemon/dbus/gkd-secret-change.c:352
+#: ../daemon/dbus/gkd-secret-change.c:354
 msgid "Change Keyring Password"
-msgstr "Đổi mật khẩu vòng khóa"
+msgstr "Đổi mật khẩu chùm chìa khóa"
 
-#: ../daemon/dbus/gkd-secret-create.c:81
+#: ../daemon/dbus/gkd-secret-create.c:80
 #, c-format
 msgid ""
 "An application wants to create a new keyring called '%s'. Choose the "
 "password you want to use for it."
 msgstr ""
-"Một ứng dụng muốn tạo một vòng khóa mới tên '%s'. Hãy chọn mật khẩu cần sử "
-"dụng với nó."
+"Một ứng dụng muốn tạo một chùm chìa khóa mới tên “%s”. Hãy chọn mật khẩu mà "
+"bạn muốn áp dụng cho nó."
 
-#: ../daemon/dbus/gkd-secret-create.c:85
+#: ../daemon/dbus/gkd-secret-create.c:84
 msgid "Choose password for new keyring"
-msgstr "Hãy chọn mật khẩu cho vòng khóa mới"
+msgstr "Hãy chọn mật khẩu cho chùm chìa khóa mới"
 
-#: ../daemon/dbus/gkd-secret-create.c:308
+#: ../daemon/dbus/gkd-secret-create.c:311
 msgid "New Keyring Password"
-msgstr "Mật khẩu vòng khóa mới"
+msgstr "Mật khẩu chùm chìa khóa mới"
 
 #: ../daemon/gnome-keyring-gpg.desktop.in.in.h:1
 msgid "GPG Password Agent"
@@ -115,47 +115,42 @@
 
 #: ../daemon/gnome-keyring-gpg.desktop.in.in.h:2
 msgid "GNOME Keyring: GPG Agent"
-msgstr "Vòng Khoá GNOME: GPG Agent"
+msgstr "Chùm chìa khóa GNOME: Đại diện GPG"
 
 #: ../daemon/gnome-keyring-pkcs11.desktop.in.in.h:1
 msgid "Certificate and Key Storage"
-msgstr "Lưu trữ Chứng nhận và Khoá"
+msgstr "Lưu trữ Chứng nhận và khóa"
 
 #: ../daemon/gnome-keyring-pkcs11.desktop.in.in.h:2
 msgid "GNOME Keyring: PKCS#11 Component"
-msgstr "Vòng Khoá GNOME: thành phần PKCS#11"
+msgstr "Chùm chìa khóa GNOME: thành phần PKCS#11"
 
 #: ../daemon/gnome-keyring-secrets.desktop.in.in.h:1
 msgid "Secret Storage Service"
-msgstr "Dịch vụ lưu trữ mật"
+msgstr "Dịch vụ lưu trữ bảo mật"
 
 #: ../daemon/gnome-keyring-secrets.desktop.in.in.h:2
 msgid "GNOME Keyring: Secret Service"
-msgstr "Vòng Khoá GNOME: dịch vụ mật"
+msgstr "Chùm chìa khóa GNOME: dịch vụ bảo mật"
 
 #: ../daemon/gnome-keyring-ssh.desktop.in.in.h:1
 msgid "SSH Key Agent"
-msgstr "Tác nhân khoá SSH"
+msgstr "Đại diện khóa SSH"
 
 #: ../daemon/gnome-keyring-ssh.desktop.in.in.h:2
 msgid "GNOME Keyring: SSH Agent"
-msgstr "Vòng Khoá GNOME: SSH Agent"
+msgstr "Chùm chìa khóa GNOME: Đại diện SSH"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:106
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:82
 msgid "Unknown"
 msgstr "Không biết"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:203
-#, c-format
-msgid "PGP Key: %s"
-msgstr "Khóa PGP: %s"
-
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:360
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:361
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:144
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:145
 msgid "Enter Passphrase"
 msgstr "Nhập mật mã"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:365
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:149
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:602
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:630
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:645
@@ -163,32 +158,36 @@
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:767
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:799
 msgid "Unlock"
-msgstr "Mở khoá"
+msgstr "Mở khóa"
 
-#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:394
-#| msgid "Automatically unlock this keyring whenever I'm logged in"
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:162
 msgid "Automatically unlock this key, whenever I'm logged in"
-msgstr "Tự động gỡ khoá khoá này khi nào tôi đã đăng nhập"
+msgstr "Tự động gỡ khóa khóa này khi nào tôi đã đăng nhập"
+
+#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:225
+#, c-format
+msgid "PGP Key: %s"
+msgstr "Khóa PGP: %s"
 
 #. TRANSLATORS: This is the display label for the login keyring
-#: ../daemon/login/gkd-login.c:145
+#: ../daemon/login/gkd-login.c:158
 msgid "Login"
 msgstr "Đăng nhập"
 
 #: ../egg/dotlock.c:668
 #, c-format
 msgid "failed to create temporary file `%s': %s\n"
-msgstr "lỗi tạo tập tin tạm `%s': %s\n"
+msgstr "gặp lỗi khi tạo tập tin tạm “%s”: %s\n"
 
 #: ../egg/dotlock.c:718
 #, c-format
 msgid "error writing to `%s': %s\n"
-msgstr "lỗi ghi vào `%s': %s\n"
+msgstr "gặp lỗi khi ghi vào “%s”: %s\n"
 
 #: ../egg/dotlock.c:782
 #, c-format
 msgid "can't create `%s': %s\n"
-msgstr "lỗi tạo `%s': %s\n"
+msgstr "Không thể tạo “%s”: %s\n"
 
 #. Note: It is unlikley that we get a race here unless a pid is
 #. reused too fast or a new process with the same pid as the one
@@ -196,201 +195,203 @@
 #: ../egg/dotlock.c:1048
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
-msgstr "bỏ tập tin khoá không còn dùng (tạo bởi %d)\n"
+msgstr "xóa bỏ tập tin khóa đã hỏng (được tạo bởi %d)\n"
 
 #: ../egg/dotlock.c:1084
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
-msgstr "chờ khoá (giữ bởi %d%s) %s...\n"
+msgstr "chờ khóa (được giữ bởi %d%s) %s...\n"
 
+# http://vi.wikipedia.org/wiki/Deadlock
+# deadlock (Khóa chết) Là trạng thái xảy ra trong môi trường đa nhiệm (Muti-Threading) khi hai hoặc nhiều tiến trình đi vào vòng lặp chờ tài nguyên mãi mãi.
 #: ../egg/dotlock.c:1085
 msgid "(deadlock?) "
-msgstr ""
+msgstr "(khóa chết?)"
 
 #: ../egg/dotlock.c:1124
 #, c-format
 msgid "lock `%s' not made: %s\n"
-msgstr "khoá `%s' chưa được tạo: %s\n"
+msgstr "khóa “%s” chưa được tạo: %s\n"
 
 #: ../egg/dotlock.c:1150
 #, c-format
 msgid "waiting for lock %s...\n"
-msgstr "chờ khoá %s...\n"
+msgstr "chờ khóa %s...\n"
 
-#: ../egg/egg-oid.c:41
+#: ../egg/egg-oid.c:40
 msgid "Domain Component"
-msgstr "Thành phần Miền"
+msgstr "Thành phần tên miền"
 
-#: ../egg/egg-oid.c:43
+#: ../egg/egg-oid.c:42
 msgid "User ID"
 msgstr "Mã số người dùng"
 
-#: ../egg/egg-oid.c:46
+#: ../egg/egg-oid.c:45
 msgid "Email Address"
 msgstr "Thư điện tử"
 
-#: ../egg/egg-oid.c:54
+#: ../egg/egg-oid.c:53
 msgid "Date of Birth"
 msgstr "Ngày sinh"
 
-#: ../egg/egg-oid.c:56
+#: ../egg/egg-oid.c:55
 msgid "Place of Birth"
 msgstr "Nơi sinh"
 
-#: ../egg/egg-oid.c:58
+#: ../egg/egg-oid.c:57
 msgid "Gender"
 msgstr "Giới tính"
 
-#: ../egg/egg-oid.c:60
+#: ../egg/egg-oid.c:59
 msgid "Country of Citizenship"
 msgstr "Quốc gia cấp công dân"
 
-#: ../egg/egg-oid.c:62
+#: ../egg/egg-oid.c:61
 msgid "Country of Residence"
 msgstr "Quốc gia ở"
 
-#: ../egg/egg-oid.c:65
+#: ../egg/egg-oid.c:64
 msgid "Common Name"
 msgstr "Tên chung"
 
-#: ../egg/egg-oid.c:67
+#: ../egg/egg-oid.c:66
 msgid "Surname"
 msgstr "Họ"
 
-#: ../egg/egg-oid.c:69
+#: ../egg/egg-oid.c:68
 msgid "Serial Number"
 msgstr "Số thứ tự"
 
-#: ../egg/egg-oid.c:71
+#: ../egg/egg-oid.c:70
 msgid "Country"
 msgstr "Quốc gia"
 
-#: ../egg/egg-oid.c:73
+#: ../egg/egg-oid.c:72
 msgid "Locality"
 msgstr "Vùng"
 
-#: ../egg/egg-oid.c:75
+#: ../egg/egg-oid.c:74
 msgid "State"
 msgstr "Tỉnh"
 
-#: ../egg/egg-oid.c:77
+#: ../egg/egg-oid.c:76
 msgid "Street"
 msgstr "Đường"
 
-#: ../egg/egg-oid.c:79
+#: ../egg/egg-oid.c:78
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: ../egg/egg-oid.c:81
+#: ../egg/egg-oid.c:80
 msgid "Organizational Unit"
 msgstr "Đơn vị tổ chức"
 
-#: ../egg/egg-oid.c:83
+#: ../egg/egg-oid.c:82
 msgid "Title"
 msgstr "Tuổi tác"
 
-#: ../egg/egg-oid.c:85
+#: ../egg/egg-oid.c:84
 msgid "Telephone Number"
 msgstr "Số điện thoại"
 
-#: ../egg/egg-oid.c:87
+#: ../egg/egg-oid.c:86
 msgid "Given Name"
 msgstr "Tên hay gọi"
 
-#: ../egg/egg-oid.c:89
+#: ../egg/egg-oid.c:88
 msgid "Initials"
 msgstr "Tên viết tắt"
 
-#: ../egg/egg-oid.c:91
+#: ../egg/egg-oid.c:90
 msgid "Generation Qualifier"
 msgstr "Thế hệ dè dặt"
 
-#: ../egg/egg-oid.c:93
+#: ../egg/egg-oid.c:92
 msgid "DN Qualifier"
 msgstr "Tên miền dè dặt"
 
-#: ../egg/egg-oid.c:95
+#: ../egg/egg-oid.c:94
 msgid "Pseudonym"
 msgstr "Biệt hiệu"
 
-#: ../egg/egg-oid.c:98
+#: ../egg/egg-oid.c:97
 msgid "RSA"
 msgstr "RSA"
 
-#: ../egg/egg-oid.c:99
+#: ../egg/egg-oid.c:98
 msgid "MD2 with RSA"
 msgstr "MD2 với mã hoá RSA"
 
-#: ../egg/egg-oid.c:100
+#: ../egg/egg-oid.c:99
 msgid "MD5 with RSA"
 msgstr "MD5 với mã hoá RSA"
 
-#: ../egg/egg-oid.c:101
+#: ../egg/egg-oid.c:100
 msgid "SHA1 with RSA"
 msgstr "SHA1 với mã hoá RSA"
 
-#: ../egg/egg-oid.c:103
+#: ../egg/egg-oid.c:102
 msgid "DSA"
 msgstr "DSA"
 
-#: ../egg/egg-oid.c:104
+#: ../egg/egg-oid.c:103
 msgid "SHA1 with DSA"
 msgstr "SHA1 với mã hoá DSA"
 
 #. Extended Key Usages
-#: ../egg/egg-oid.c:107
+#: ../egg/egg-oid.c:106
 msgid "Server Authentication"
 msgstr "Xác thực máy chủ"
 
-#: ../egg/egg-oid.c:108
+#: ../egg/egg-oid.c:107
 msgid "Client Authentication"
 msgstr "Xác thực máy khách"
 
-#: ../egg/egg-oid.c:109
+#: ../egg/egg-oid.c:108
 msgid "Code Signing"
 msgstr "Ký mã"
 
-#: ../egg/egg-oid.c:110
+#: ../egg/egg-oid.c:109
 msgid "Email Protection"
 msgstr "Bảo vệ thư"
 
-#: ../egg/egg-oid.c:111
+#: ../egg/egg-oid.c:110
 msgid "Time Stamping"
-msgstr "Tem thời gian"
+msgstr "Dấu vết thời gian"
 
-#: ../egg/egg-spawn.c:273
+#: ../egg/egg-spawn.c:272
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr ""
-"Gặp lỗi bất thường trong « select() » khi đọc dữ liệu từ một tiến trình con "
+"Gặp lỗi bất thường trong “select()” khi đọc dữ liệu từ một tiến trình con "
 "(%s)"
 
-#: ../egg/egg-spawn.c:320
+#: ../egg/egg-spawn.c:319
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
-msgstr "Gặp lỗi bất thường trong « waitpid() » (%s)"
+msgstr "Gặp lỗi bất thường trong “waitpid()” (%s)"
 
-#: ../pkcs11/gkm/gkm-certificate.c:572
+#: ../pkcs11/gkm/gkm-certificate.c:580
 msgid "Unnamed Certificate"
 msgstr "Chứng nhận không tên"
 
-#: ../pkcs11/ssh-store/gkm-ssh-private-key.c:339
+#: ../pkcs11/ssh-store/gkm-ssh-private-key.c:341
 msgid "Couldn't parse public SSH key"
-msgstr "Không thể phân tích cú pháp của khoá SSH công khai"
+msgstr "Không thể phân tích cú pháp của khóa SSH công"
 
 #. Get the label ready
 #: ../pkcs11/wrap-layer/gkm-wrap-login.c:345
 #, c-format
 msgid "Unlock password for: %s"
-msgstr "Mật khẩu gỡ khoá cho: %s"
+msgstr "Mật khẩu gỡ khóa cho: %s"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:590
 msgid "Unlock Login Keyring"
-msgstr "Gỡ khoá vòng khoá đăng nhập"
+msgstr "Gỡ khóa chùm chìa khóa đăng nhập"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:592
 msgid "Enter password to unlock your login keyring"
-msgstr "Nhập mật khẩu để gỡ khoá vòng khoá đăng nhập"
+msgstr "Nhập mật khẩu để gỡ khóa chùm chìa khóa đăng nhập"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:596
 msgid ""
@@ -398,35 +399,36 @@
 "your login keyring."
 msgstr ""
 "Bạn đang sử dụng một mật khẩu để đăng nhập vào máy tính mà không còn tương "
-"ứng với mật khẩu của vòng khoá đăng nhập."
+"ứng với mật khẩu của chùm chìa khóa đăng nhập."
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:598
 msgid ""
 "The login keyring did not get unlocked when you logged into your computer."
 msgstr ""
-"Vòng khoá đăng nhập đã không được gỡ khoá khi bạn đăng nhập vào máy tính này."
+"Chùm chìa khóa đăng nhập đã không được gỡ khóa khi bạn đăng nhập vào máy "
+"tính này."
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:616
 msgid "Unlock Keyring"
-msgstr "Mở vòng"
+msgstr "Mở khóa chùm chìa khóa"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:618
 #, c-format
 msgid "Enter password for keyring '%s' to unlock"
-msgstr "Hãy nhập mật khẩu cho vòng khóa '%s' để mở vòng khóa"
+msgstr "Hãy nhập mật khẩu cho chùm chìa khóa “%s” để mở chùm chìa khóa"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:622
 #, c-format
 msgid "An application wants access to the keyring '%s', but it is locked"
-msgstr "Một ứng dụng muốn truy cập đến vòng khóa '%s', còn nó bị khoá"
+msgstr "Một ứng dụng muốn dùng chùm chìa khóa “%s”, nhưng nó đang bị khóa"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:628
 msgid "Automatically unlock this keyring whenever I'm logged in"
-msgstr "Tự động gỡ khoá vòng khoá này khi nào tôi đã đăng nhập"
+msgstr "Tự động gỡ khóa chùm chìa khóa này khi nào tôi đã đăng nhập"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:639
 msgid "Unlock private key"
-msgstr "Mở khoá cá nhân"
+msgstr "Mở khóa riêng"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:641
 msgid "Unlock certificate"
@@ -434,11 +436,11 @@
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:643
 msgid "Unlock public key"
-msgstr "Mở khoá công khai"
+msgstr "Mở khóa công khai"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:654
 msgid "Enter password to unlock the private key"
-msgstr "Gõ mật khẩu để mở khoá cá nhân"
+msgstr "Gõ mật khẩu để mở khóa riêng"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:656
 msgid "Enter password to unlock the certificate"
@@ -446,66 +448,63 @@
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:658
 msgid "Enter password to unlock the public key"
-msgstr "Gõ mật khẩu để mở khoá công khai"
+msgstr "Gõ mật khẩu để mở khóa công khai"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:660
 msgid "Enter password to unlock"
-msgstr "Gõ mật khẩu để gỡ khoá"
+msgstr "Gõ mật khẩu để gỡ khóa"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:670
-#| msgid "Automatically unlock this keyring whenever I'm logged in"
 msgid "Automatically unlock this key whenever I'm logged in"
-msgstr "Tự động gỡ khoá khoá này khi nào tôi đã đăng nhập"
+msgstr "Tự động gỡ khóa khóa này khi nào tôi đã đăng nhập"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:672
-#| msgid "Automatically unlock this keyring whenever I'm logged in"
 msgid "Automatically unlock this certificate whenever I'm logged in"
-msgstr "Tự động gỡ khoá chứng nhận này khi nào tôi đã đăng nhập"
+msgstr "Tự động gỡ khóa chứng nhận này khi nào tôi đã đăng nhập"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:674
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:796
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1140
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1288
-#| msgid "Automatically unlock this keyring whenever I'm logged in"
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1160
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1309
 msgid "Automatically unlock whenever I'm logged in"
-msgstr "Tự động mở khoá khi tôi đăng nhập"
+msgstr "Tự động mở khóa khi tôi đăng nhập"
 
 #. TRANSLATORS: The private key is locked
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:685
 #, c-format
 msgid "An application wants access to the private key '%s', but it is locked"
-msgstr "Ứng dụng muốn truy cập đến khoá cá nhân %s, nhưng nó đang bị khóa"
+msgstr "Ứng dụng muốn dùng khóa riêng “%s”, nhưng nó đang bị khóa"
 
 #. TRANSLATORS: The certificate is locked
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:688
 #, c-format
 msgid "An application wants access to the certificate '%s', but it is locked"
-msgstr "Ứng dụng muốn truy cập đến chứng nhận %s, nhưng nó đang bị khóa"
+msgstr "Ứng dụng muốn dùng chứng nhận “%s”, nhưng nó đang bị khóa"
 
 #. TRANSLATORS: The public key is locked
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:691
 #, c-format
 msgid "An application wants access to the public key '%s', but it is locked"
-msgstr "Ứng dụng muốn truy cập đến khoá công khai %s, nhưng nó đang bị khóa"
+msgstr "Ứng dụng muốn dùng khóa công khai “%s”, nhưng nó đang bị khóa"
 
 #. TRANSLATORS: The object '%s' is locked
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:694
 #, c-format
 msgid "An application wants access to '%s', but it is locked"
-msgstr "Ứng dụng muốn truy cập đến '%s', nhưng nó bị khóa"
+msgstr "Ứng dụng muốn dùng “%s”, nhưng nó đang bị khóa"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:765
 msgid "The unlock password was incorrect"
-msgstr "Bạn đã gõ sai mật khẩu gỡ khoá"
+msgstr "Bạn đã gõ sai mật khẩu gỡ khóa"
 
 #. Build up the prompt
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:786
 msgid "Unlock certificate/key storage"
-msgstr "Mở khoá lưu trữ chứng nhận/khoá"
+msgstr "Mở khóa lưu trữ chứng nhận/khóa"
 
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:787
 msgid "Enter password to unlock the certificate/key storage"
-msgstr "Nhập mật khẩu để mở khoá kho lưu chứng nhận/khoá"
+msgstr "Nhập mật khẩu để mở khóa kho lưu chứng nhận/khóa"
 
 #. TRANSLATORS: The storage is locked, and needs unlocking before the application can use it.
 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:790
@@ -514,65 +513,60 @@
 "An application wants access to the certificate/key storage '%s', but it is "
 "locked"
 msgstr ""
-"Một ứng dụng muốn truy cập đến kho lưu chứng nhận/khoá '%s', nhưng nó vẫn bị "
+"Một ứng dụng muốn dùng kho lưu chứng nhận/khóa “%s”, nhưng nó vẫn đang bị "
 "khóa"
 
-#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1131
+#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1151