[gnome-keyring/gck-work: 75/75] Merge branch 'master' into gck-work
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring/gck-work: 75/75] Merge branch 'master' into gck-work
- Date: Sun, 12 Sep 2010 21:20:24 +0000 (UTC)
commit c7f954aafdc4de66ccf191e72fcd93353047e7f5
Merge: 8ea37e4 10cfc8e
Author: Stef Walter <stef memberwebs com>
Date: Sun Sep 12 21:19:52 2010 +0000
Merge branch 'master' into gck-work
.gitignore | 1 +
Makefile.am | 8 +-
NEWS | 32 +
autogen.sh | 9 +-
configure.in | 94 ++-
daemon/data/Makefile.am | 2 +-
daemon/dbus/gkd-secret-unlock.c | 6 +-
daemon/gpg-agent/gkd-gpg-agent-ops.c | 78 ++-
daemon/gpg-agent/gkd-gpg-agent-private.h | 2 +
daemon/gpg-agent/gkd-gpg-agent.c | 57 +-
daemon/ssh-agent/gkd-ssh-agent-ops.c | 3 +-
docs/reference/gcr/Makefile.am | 5 +-
egg/egg-secure-memory.c | 7 +-
egg/tests/test-data/echo-script.sh | 1 +
gcr/.gitignore | 1 +
gcr/Makefile.am | 17 +-
gcr/gcr-unlock-options-widget.c | 259 ++++--
gcr/gcr-unlock-options-widget.h | 26 +
gcr/gcr-unlock-options-widget.ui | 36 +-
gcr/gcr-unlock-options.h | 32 +
gcr/gcr.pc.in | 8 +-
gcr/tests/.gitignore | 1 +
gcr/tests/Makefile.am | 19 +-
gcr/tests/ui-test-unlock-options.c | 83 ++
gp11/gp11-attributes.c | 12 +-
gp11/gp11-misc.c | 2 +-
gp11/gp11-module.c | 6 +
gp11/gp11-object.c | 6 +
gp11/gp11-session.c | 6 +
gp11/gp11-slot.c | 8 +-
gp11/gp11.h | 18 +-
pam/gkr-pam-client.c | 31 +-
pkcs11/gkm/gkm-certificate.c | 9 +-
pkcs11/secret-store/gkm-secret-collection.c | 2 +-
pkcs11/wrap-layer/gkm-wrap-layer.c | 4 +-
pkcs11/wrap-layer/gkm-wrap-login.c | 2 +-
pkcs11/wrap-layer/gkm-wrap-prompt.c | 114 ++-
po/POTFILES.in | 3 +-
po/ar.po | 589 +++++++------
po/de.po | 381 ++++----
po/el.po | 1084 ++++++-----------------
po/en_GB.po | 610 +++++++------
po/es.po | 129 ++--
po/et.po | 313 +------
po/fr.po | 599 +++++++-------
po/gl.po | 122 ++--
po/he.po | 118 ++--
po/hu.po | 575 ++++++------
po/id.po | 1281 ++++++++++++++++++++-------
po/nb.po | 76 +--
po/nl.po | 619 +++++++------
po/pa.po | 124 ++--
po/pt.po | 625 +++++++------
po/sl.po | 89 ++-
po/sr.po | 648 +++++++-------
po/sr latin po | 646 +++++++-------
po/sv.po | 90 ++-
po/ta.po | 112 ++--
po/zh_CN.po | 284 +++---
po/zh_HK.po | 131 ++--
po/zh_TW.po | 140 ++--
schema/Makefile.am | 17 +
schema/org.gnome.crypto.cache.convert | 3 +
schema/org.gnome.crypto.cache.gschema.xml | 19 +
schema/org.gnome.crypto.pgp.convert | 6 +
schema/org.gnome.crypto.pgp.gschema.xml | 29 +
tool/.gitignore | 1 +
tool/Makefile.am | 16 +-
ui/.gitignore | 1 +
ui/Makefile.am | 18 +-
ui/gku-prompt-tool.c | 361 +++++++-
ui/gku-prompt.c | 85 ++-
ui/gku-prompt.h | 23 +-
ui/gku-prompt.ui | 49 +-
ui/tests/test-data/prompt-empty | 2 +
ui/tests/test-data/prompt-full | 4 +-
ui/tests/test-data/prompt-test | 1 +
77 files changed, 6086 insertions(+), 4944 deletions(-)
---
diff --cc configure.in
index 22cd1ec,1cafd53..e931f26
--- a/configure.in
+++ b/configure.in
@@@ -5,19 -5,34 +5,34 @@@ AM_CONFIG_HEADER(config.h
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
dnl ****************************************************************************
- dnl Library libtool versioning
-
- GP11_MAJOR=0 # Increment for major version number, breaks old apps.
- GP11_REVISION=0 # Increment for internal changes, nothing affected.
- GP11_AGE=0 # Increment for interface that doesn't break anything
-
- GCK_MAJOR=0 # Increment for major version number, breaks old apps.
- GCK_REVISION=0 # Increment for internal changes, nothing affected.
- GCK_AGE=0 # Increment for interface that doesn't break anything
-
- GCR_MAJOR=0 # Increment for major version number, breaks old apps.
- GCR_REVISION=0 # Increment for internal changes, nothing affected.
- GCR_AGE=0 # Increment for interface that doesn't break anything
+ dnl Library package and libtool versioning
+ dnl
+ dnl Updating the libtool versions, follow these instructions sequentially:
+ dnl 1. If the library source code has changed at all since the last update, then increment revision (â??c:r:aâ?? becomes â??c:r+1:aâ??).
+ dnl 2. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
+ dnl 3. If any interfaces have been added since the last public release, then increment age.
+ dnl 4. If any interfaces have been removed or changed since the last public release, then set age to 0.
+
-# GP11 package versioning
-GP11_MAJOR=0
-GP11_MINOR=0
-GP11_MICRO=0
++# GCK package versioning
++GCK_MAJOR=0
++GCK_MINOR=0
++GCK_MICRO=0
+
-# GP11 libtool versioning
-GP11_CURRENT=0
-GP11_REVISION=0
-GP11_AGE=0
++# GCK libtool versioning
++GCK_CURRENT=0
++GCK_REVISION=0
++GCK_AGE=0
+
+ # GCR package versioning
+ GCR_MAJOR_GTK2=0
+ GCR_MAJOR_GTK3=3
+ GCR_MINOR=0
+ GCR_MICRO=0
+
+ # GCR libtool versioning
+ GCR_CURRENT=0
+ GCR_REVISION=0
+ GCR_AGE=0
dnl ****************************************************************************
@@@ -575,17 -619,14 +619,19 @@@ f
# ----------------------------------------------------------------------
- GP11_LT_RELEASE=$GP11_MAJOR:$GP11_REVISION:$GP11_AGE
- AC_SUBST(GP11_LT_RELEASE)
- AC_SUBST(GP11_MAJOR)
-
- GCK_LT_RELEASE=$GCK_MAJOR:$GCK_REVISION:$GCK_AGE
-GP11_LT_RELEASE=$GP11_CURRENT:$GP11_REVISION:$GP11_AGE
++GCK_LT_RELEASE=$GCK_CURRENT:$GCK_REVISION:$GCK_AGE
+AC_SUBST(GCK_LT_RELEASE)
+AC_SUBST(GCK_MAJOR)
+
- GCR_LT_RELEASE=$GCR_MAJOR:$GCR_REVISION:$GCR_AGE
++GP11_LT_RELEASE=$GCK_LT_RELEASE
++GP11_MAJOR=$GCK_MAJOR
+ AC_SUBST(GP11_LT_RELEASE)
+ AC_SUBST(GP11_MAJOR)
+
+ GCR_LT_RELEASE=$GCR_CURRENT:$GCR_REVISION:$GCR_AGE
AC_SUBST(GCR_LT_RELEASE)
AC_SUBST(GCR_MAJOR)
+ AC_SUBST(GCR_VERSION_SUFFIX)
AC_SUBST(DAEMON_CFLAGS)
AC_SUBST(DAEMON_LIBS)
diff --cc daemon/dbus/gkd-secret-unlock.c
index c716073,d3b161c..0be3a26
--- a/daemon/dbus/gkd-secret-unlock.c
+++ b/daemon/dbus/gkd-secret-unlock.c
@@@ -226,13 -229,14 +229,14 @@@ perform_next_unlock (GkdSecretUnlock *s
}
/* The various unlock options */
- template = gp11_attributes_new ();
+ template = gck_attributes_new ();
common_unlock_attributes (template, collection);
- gp11_attributes_add_data (template, CKA_VALUE, NULL, 0);
+ gck_attributes_add_data (template, CKA_VALUE, NULL, 0);
session = gkd_secret_service_get_pkcs11_session (self->service, self->caller);
- gck_session_create_object_async (session, template, self->cancellable, on_unlock_complete, self);
- gp11_session_create_object_async (session, template, self->cancellable, on_unlock_complete,
- g_object_ref (self));
- gp11_attributes_unref (template);
++ gck_session_create_object_async (session, template, self->cancellable, on_unlock_complete,
++ g_object_ref (self));
+ gck_attributes_unref (template);
g_object_unref (collection);
self->current = objpath;
diff --cc daemon/gpg-agent/gkd-gpg-agent-ops.c
index 5707ef5,69bbbd4..f585b98
--- a/daemon/gpg-agent/gkd-gpg-agent-ops.c
+++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c
@@@ -282,8 -289,55 +284,55 @@@ do_lookup_password (GckSession *session
return data;
}
+ static void
+ load_unlock_options (GkuPrompt *prompt)
+ {
+ GSettings *settings;
+ gchar *method;
+ gint ttl;
+
+ settings = gkd_gpg_agent_settings ();
+
+ method = g_settings_get_string (settings, "gpg-cache-method");
+ if (!method) {
+ method = g_strdup (GCR_UNLOCK_OPTION_SESSION);
+
+ /* COMPAT: with old seahorse-agent settings that were migrated */
+ } else if (g_str_equal (method, "gnome")) {
+ g_free (method);
+ method = g_strdup (GCR_UNLOCK_OPTION_ALWAYS);
+ } else if (g_str_equal (method, "internal")) {
+ g_free (method);
+ method = g_strdup (GCR_UNLOCK_OPTION_SESSION);
+ }
+
+ gku_prompt_set_unlock_choice (prompt, method);
+ g_free (method);
+
+ ttl = g_settings_get_int (settings, "gpg-cache-ttl");
+ gku_prompt_set_unlock_ttl (prompt, ttl <= 0 ? 1 : (guint)ttl);
+ }
+
+ static void
+ save_unlock_options (GkuPrompt *prompt)
+ {
+ GSettings *settings;
+ const gchar *method;
+ gint ttl;
+
+ settings = gkd_gpg_agent_settings ();
+
+ method = gku_prompt_get_unlock_choice (prompt);
+ if (method)
+ g_settings_set_string (settings, "gpg-cache-method", method);
+
+ ttl = gku_prompt_get_unlock_ttl (prompt);
+ if (ttl >= 0)
+ g_settings_set_int (settings, "gpg-cache-ttl", (gint)ttl);
+ }
+
static GkuPrompt*
-prepare_password_prompt (GP11Session *session, const gchar *errmsg, const gchar *prompt_text,
+prepare_password_prompt (GckSession *session, const gchar *errmsg, const gchar *prompt_text,
const gchar *description, gboolean confirm)
{
GkuPrompt *prompt;
@@@ -331,12 -381,14 +379,14 @@@
auto_unlock = TRUE;
}
- if (auto_unlock)
- gku_prompt_show_widget (prompt, "auto_area");
- else
- gku_prompt_hide_widget (prompt, "auto_area");
+ gku_prompt_set_unlock_sensitive (prompt, GCR_UNLOCK_OPTION_ALWAYS, auto_unlock, NULL);
+ gku_prompt_set_unlock_label (prompt, GCR_UNLOCK_OPTION_IDLE, _("Forget this password if idle for"));
+ gku_prompt_set_unlock_label (prompt, GCR_UNLOCK_OPTION_TIMEOUT, _("Forget this password after"));
+ gku_prompt_set_unlock_label (prompt, GCR_UNLOCK_OPTION_SESSION, _("Forget this password when I log out"));
+
+ load_unlock_options (prompt);
- gp11_list_unref_free (objects);
+ gck_list_unref_free (objects);
return prompt;
}
@@@ -349,15 -401,16 +399,16 @@@ on_prompt_attention (gpointer user_data
}
static gchar*
-do_get_password (GP11Session *session, const gchar *keyid, const gchar *errmsg,
+do_get_password (GckSession *session, const gchar *keyid, const gchar *errmsg,
const gchar *prompt_text, const gchar *description, gboolean confirm)
{
- GP11Attributes *attrs;
+ GckAttributes *attrs;
gchar *password = NULL;
- gint value = 0;
GkuPrompt *prompt;
+ const gchar *choice;
+ guint ttl;
- g_assert (GP11_IS_SESSION (session));
+ g_assert (GCK_IS_SESSION (session));
g_assert (keyid);
password = do_lookup_password (session, keyid);
@@@ -375,22 -428,27 +426,27 @@@
g_return_val_if_fail (password, NULL);
/* Load up the save options */
- attrs = gp11_attributes_new ();
+ attrs = gck_attributes_new ();
- if (gku_prompt_get_unlock_option (prompt, GKU_UNLOCK_AUTO, &value))
+ choice = gku_prompt_get_unlock_choice (prompt);
+ ttl = gku_prompt_get_unlock_ttl (prompt);
+
+ if (g_str_equal (choice, GCR_UNLOCK_OPTION_ALWAYS))
- gp11_attributes_add_string (attrs, CKA_G_COLLECTION, "login");
+ gck_attributes_add_string (attrs, CKA_G_COLLECTION, "login");
else
- gp11_attributes_add_string (attrs, CKA_G_COLLECTION, "session");
+ gck_attributes_add_string (attrs, CKA_G_COLLECTION, "session");
- if (gku_prompt_get_unlock_option (prompt, GKU_UNLOCK_IDLE, &value) && value > 0)
- gck_attributes_add_ulong (attrs, CKA_G_DESTRUCT_IDLE, value);
+ if (g_str_equal (choice, GCR_UNLOCK_OPTION_IDLE))
- gp11_attributes_add_ulong (attrs, CKA_G_DESTRUCT_IDLE, ttl);
++ gck_attributes_add_ulong (attrs, CKA_G_DESTRUCT_IDLE, ttl);
- if (gku_prompt_get_unlock_option (prompt, GKU_UNLOCK_TIMEOUT, &value) && value > 0)
- gck_attributes_add_ulong (attrs, CKA_G_DESTRUCT_AFTER, value);
+ else if (g_str_equal (choice, GCR_UNLOCK_OPTION_TIMEOUT))
- gp11_attributes_add_ulong (attrs, CKA_G_DESTRUCT_AFTER, ttl);
++ gck_attributes_add_ulong (attrs, CKA_G_DESTRUCT_AFTER, ttl);
/* Now actually save the password */
do_save_password (session, keyid, description, password, attrs);
- gp11_attributes_unref (attrs);
+ gck_attributes_unref (attrs);
+
+ save_unlock_options (prompt);
}
g_object_unref (prompt);
diff --cc daemon/ssh-agent/gkd-ssh-agent-ops.c
index 02a5fd7,640fece..845c8dd
--- a/daemon/ssh-agent/gkd-ssh-agent-ops.c
+++ b/daemon/ssh-agent/gkd-ssh-agent-ops.c
@@@ -1047,7 -1004,8 +1047,8 @@@ op_sign_request (GkdSshAgentCall *call
g_free (hash);
if (error) {
- if (!g_error_matches (error, GCK_ERROR, CKR_FUNCTION_CANCELED))
- if (!g_error_matches (error, GP11_ERROR, CKR_FUNCTION_CANCELED) &&
- !g_error_matches (error, GP11_ERROR, CKR_PIN_INCORRECT))
++ if (!g_error_matches (error, GCK_ERROR, CKR_FUNCTION_CANCELED) &&
++ !g_error_matches (error, GCK_ERROR, CKR_PIN_INCORRECT))
g_message ("signing of the data failed: %s", egg_error_message (error));
g_clear_error (&error);
egg_buffer_add_byte (call->resp, GKD_SSH_RES_FAILURE);
diff --cc gcr/Makefile.am
index ac174b7,4d810b5..b1dcc9f
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@@ -64,10 -67,10 +67,10 @@@ libgcr GCR_VERSION_SUFFIX@_la_LDFLAGS
-version-info $(GCR_LT_RELEASE) \
-no-undefined -export-symbols-regex 'gcr_*'
- libgcr_la_LIBADD = \
+ libgcr GCR_VERSION_SUFFIX@_la_LIBADD = \
$(top_builddir)/egg/libegg.la \
$(top_builddir)/egg/libegg-entry-buffer.la \
- $(top_builddir)/gp11/libgp11.la \
+ $(top_builddir)/gck/libgck.la \
$(GOBJECT_LIBS) \
$(GLIB_LIBS) \
$(LIBGCRYPT_LIBS) \
diff --cc po/POTFILES.in
index ad4e044,8bddf2d..5fbcfda
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -21,6 -20,6 +20,8 @@@ gcr/gcr-certificate-details-widget.
gcr/gcr-importer.c
gcr/gcr-parser.c
gp11/gp11-misc.c
++gck/gck-uri.c
++gck/gck-misc.c
pkcs11/gkm/gkm-certificate.c
pkcs11/ssh-store/gkm-ssh-private-key.c
pkcs11/secret-store/gkm-secret-collection.c
diff --cc po/fr.po
index 5fb7943,0f7783e..60b8151
--- a/po/fr.po
+++ b/po/fr.po
@@@ -1081,6 -878,215 +878,214 @@@ msgstr "Erreur inconnue
msgid "Unnamed Certificate"
msgstr "Certificat sans nom"
- #: ../pkcs11/ssh-store/gck-ssh-private-key.c:339
+ #: ../pkcs11/ssh-store/gkm-ssh-private-key.c:339
msgid "Couldn't parse public SSH key"
msgstr "Impossible d'analyser la clé publique SSH"
+
+ #. Get the label ready
+ #: ../pkcs11/wrap-layer/gkm-wrap-login.c:317
+ #, c-format
+ msgid "Unlock password for: %s"
+ msgstr "Mot de passe de déverrouillage pour : %s"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:90
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:794
+ msgid "The unlock password was incorrect"
+ msgstr "Le mot de passe de déverrouillage n'est pas correct"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:626
+ msgid "Unlock Login Keyring"
+ msgstr "Déverrouiller le trousseau de connexion"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:628
+ msgid "Enter password to unlock your login keyring"
+ msgstr ""
+ "Saisissez votre mot de passe pour déverrouiller le trousseau de connexion"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:632
+ msgid ""
+ "The password you use to log in to your computer no longer matches that of "
+ "your login keyring."
+ msgstr ""
+ "Le mot de passe que vous utilisez pour ouvrir une session sur cet ordinateur "
+ "ne correspond plus à celui de votre trousseau de connexion."
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:634
+ msgid ""
+ "The login keyring did not get unlocked when you logged into your computer."
+ msgstr ""
+ "Le trousseau de connexion n'a pas été déverrouillé lors de votre connexion à "
+ "cet ordinateur."
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:652
+ msgid "Unlock Keyring"
+ msgstr "Déverrouiller le trousseau de clés"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:654
+ #, c-format
+ msgid "Enter password for keyring '%s' to unlock"
+ msgstr ""
+ "Saisissez le mot de passe du trousseau de clés « %s » pour le déverrouiller"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:658
+ #, c-format
+ msgid "An application wants access to the keyring '%s', but it is locked"
+ msgstr ""
+ "Une application veut accéder au trousseau de clés « %s », mais il est "
+ "verrouillé"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:678
+ msgid "Unlock private key"
+ msgstr "Déverrouiller une clé privée"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:680
+ msgid "Unlock certificate"
+ msgstr "Déverrouiller un certificat"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:682
+ msgid "Unlock public key"
+ msgstr "Déverrouiller une clé publique"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:684
+ msgid "Unlock"
+ msgstr "Déverrouiller"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:697
+ msgid "Enter password to unlock the public key"
+ msgstr "Saisissez le mot de passe pour déverrouiller la clé publique"
+
+ #. TRANSLATORS: The private key is locked
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:709
+ #, c-format
+ msgid "An application wants access to the private key '%s', but it is locked"
+ msgstr ""
+ "Une application veut accéder à la clé privée « %s », mais elle est verrouillée"
+
+ #. TRANSLATORS: The certificate is locked
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:712
+ #, c-format
+ msgid "An application wants access to the certificate '%s', but it is locked"
+ msgstr ""
+ "Une application veut accéder au certificat « %s », mais il est verrouillé"
+
+ #. TRANSLATORS: The public key is locked
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:715
+ #, c-format
+ msgid "An application wants access to the public key '%s', but it is locked"
+ msgstr ""
+ "Une application veut accéder à la clé publique « %s », mais elle est "
+ "verrouillée"
+
+ #. TRANSLATORS: The object '%s' is locked
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:718
+ #, c-format
+ msgid "An application wants access to '%s', but it is locked"
+ msgstr "Une application veut accéder à « %s », mais il est verrouillé"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:815
+ msgid "Unlock certificate/key storage"
+ msgstr "Déverrouiller le stockage de certificats/clés"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:816
+ msgid "Enter password to unlock the certificate/key storage"
+ msgstr ""
+ "Saisissez le mot de passe pour déverrouiller l'espace de stockage de "
+ "certificats/clés"
+
+ #. TRANSLATORS: The storage is locked, and needs unlocking before the application can use it.
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:819
+ #, c-format
+ msgid ""
+ "An application wants access to the certificate/key storage '%s', but it is "
+ "locked"
+ msgstr ""
+ "Une application veut accéder au stockage de certificats/clés « %s », mais il "
+ "est verrouillé"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1057
+ msgid "New Password Required"
+ msgstr "Nouveau mot de passe nécessaire"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1058
+ msgid "New password required for secure storage"
+ msgstr ""
+ "Un nouveau mot de passe est nécessaire pour l'espace de stockage sécurisé"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1060
+ #, c-format
+ msgid ""
+ "In order to prepare '%s' for storage of certificates or keys, a password is "
+ "required"
+ msgstr ""
+ "Un mot de passe est nécessaire pour préparer « %s » au stockage de "
+ "certificats ou de clés"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1183
+ msgid "Change Password"
+ msgstr "Modifier le mot de passe"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1184
+ msgid "Change password for secure storage"
+ msgstr "Modifier le mot de passe pour l'espace de stockage sécurisé"
+
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1186
+ #, c-format
+ msgid ""
+ "To change the password for '%s', the original and new passwords are required"
+ msgstr ""
+ "Pour modifier le mot de passe pour « %s », l'ancien et un nouveau mot de "
+ "passe sont nécessaires"
+
+ #: ../ui/gku-prompt-tool.c:538
+ msgid "Store passwords unencrypted?"
+ msgstr "Stocker les mots de passe de manière non chiffrée ?"
+
+ #: ../ui/gku-prompt-tool.c:539
+ 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 ""
+ "En choisissant d'utiliser un mot de passe vide, vos mots de passe stockés ne "
+ "seront pas chiffrés de manière sûre. Ils seront accessibles par n'importe "
+ "qui ayant un accès à vos fichiers."
+
+ #: ../ui/gku-prompt-tool.c:546
+ msgid "Use Unsafe Storage"
+ msgstr "Utiliser un stockage non sûr"
+
+ #: ../ui/gku-prompt-tool.c:584
+ msgid "Passwords do not match."
+ msgstr "Les mots de passe ne sont pas identiques."
+
+ #: ../ui/gku-prompt-tool.c:594
+ msgid "Password cannot be blank"
+ msgstr "Le mot de passe ne peut pas être vide"
+
+ #: ../ui/gku-prompt.ui.h:1
+ msgid "New password strength"
+ msgstr "Robustesse du nouveau mot de passe"
+
+ #: ../ui/gku-prompt.ui.h:2
+ msgid "_Application:"
+ msgstr "Appl_ication :"
+
+ #: ../ui/gku-prompt.ui.h:3
+ msgid "_Confirm:"
+ msgstr "_Confirmation :"
+
+ #: ../ui/gku-prompt.ui.h:4
+ msgid "_Details:"
+ msgstr "_Détails :"
+
+ #: ../ui/gku-prompt.ui.h:5
+ msgid "_Name:"
+ msgstr "_Nom :"
+
+ #: ../ui/gku-prompt.ui.h:6
+ msgid "_Old Password:"
+ msgstr "_Ancien mot de passe :"
+
+ #: ../ui/gku-prompt.ui.h:7
+ msgid "_Password:"
+ msgstr "_Mot de passe :"
-
diff --cc tool/Makefile.am
index e3252f5,f5b99c7..de328b2
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@@ -16,9 -16,9 +16,9 @@@ gnome_keyring GCR_VERSION_SUFFIX@_CFLAG
-DGCR_API_SUBJECT_TO_CHANGE \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
- gnome_keyring_LDADD = \
+ gnome_keyring GCR_VERSION_SUFFIX@_LDADD = \
- $(top_builddir)/gp11/libgp11.la \
+ $(top_builddir)/gck/libgck.la \
- $(top_builddir)/gcr/libgcr.la \
+ $(top_builddir)/gcr/libgcr GCR_VERSION_SUFFIX@.la \
$(top_builddir)/egg/libegg.la \
$(GTHREAD_LIBS) \
$(GTK_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
