diff -Nru seahorse-2.22.1/agent/seahorse-agent-io.c seahorse-2.22.2/agent/seahorse-agent-io.c --- seahorse-2.22.1/agent/seahorse-agent-io.c 2008-04-07 03:52:50.000000000 +0200 +++ seahorse-2.22.2/agent/seahorse-agent-io.c 2008-05-26 19:35:01.000000000 +0200 @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/ChangeLog /tmp/enEhoodfaf/seahorse-2.22.2/ChangeLog --- seahorse-2.22.1/ChangeLog 2008-04-07 03:56:37.000000000 +0200 +++ seahorse-2.22.2/ChangeLog 2008-05-26 19:36:10.000000000 +0200 @@ -1,3 +1,27 @@ +=== seahorse 2.22.2 === + +2008-05-26 Stef Walter + + * NEWS: + * README: Release version 2.22.2 + +2008-05-01 Adam Schreiber + + * agent/seahorse-agent-io.c: Add includes. + * libseahorse/seahorse-gpg-options.c:remove paths.h. + Patches from Brian Cameron. Fixes bug #530952 + +2008-04-17 Adam Schreiber + + * libseahorse/seahorse-secure-memory.c: Test for secure memory before + remapping memory functions. Patch from Coleman Kane. Fixes bug #527193 + * libseahorse/seahorse-hkp-source.c: Fix importing keys from hkp keyservers. + Patch from Mackenzie Morgan. Fixes bug #528150 + +2008-04-06 Stef Walter + + * configure.in: Bump version number + === seahorse 2.22.1 === 2008-04-06 Stef Walter diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/configure /tmp/enEhoodfaf/seahorse-2.22.2/configure --- seahorse-2.22.1/configure 2008-04-07 03:59:22.000000000 +0200 +++ seahorse-2.22.2/configure 2008-05-26 19:39:00.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for seahorse 2.22.1. +# Generated by GNU Autoconf 2.61 for seahorse 2.22.2. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -726,8 +726,8 @@ # Identity of this package. PACKAGE_NAME='seahorse' PACKAGE_TARNAME='seahorse' -PACKAGE_VERSION='2.22.1' -PACKAGE_STRING='seahorse 2.22.1' +PACKAGE_VERSION='2.22.2' +PACKAGE_STRING='seahorse 2.22.2' PACKAGE_BUGREPORT='' ac_unique_file="src/main.c" @@ -1573,7 +1573,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 seahorse 2.22.1 to adapt to many kinds of systems. +\`configure' configures seahorse 2.22.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1643,7 +1643,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of seahorse 2.22.1:";; + short | recursive ) echo "Configuration of seahorse 2.22.2:";; esac cat <<\_ACEOF @@ -1827,7 +1827,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -seahorse configure 2.22.1 +seahorse configure 2.22.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1841,7 +1841,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by seahorse $as_me 2.22.1, which was +It was created by seahorse $as_me 2.22.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2539,7 +2539,7 @@ # Define the identity of the package. PACKAGE=seahorse - VERSION=2.22.1 + VERSION=2.22.2 cat >>confdefs.h <<_ACEOF @@ -96068,7 +96068,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by seahorse $as_me 2.22.1, which was +This file was extended by seahorse $as_me 2.22.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -96121,7 +96121,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -seahorse config.status 2.22.1 +seahorse config.status 2.22.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/configure.in /tmp/enEhoodfaf/seahorse-2.22.2/configure.in --- seahorse-2.22.1/configure.in 2008-04-07 03:55:18.000000000 +0200 +++ seahorse-2.22.2/configure.in 2008-05-26 19:35:03.000000000 +0200 @@ -5,7 +5,7 @@ dnl **************************************************************************** dnl MAIN SEAHORSE VERSION (update after release) -AC_INIT(seahorse, 2.22.1) +AC_INIT(seahorse, 2.22.2) dnl **************************************************************************** dnl LIBCRYPTUI libtool versioning diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/daemon/seahorse-service-bindings.h /tmp/enEhoodfaf/seahorse-2.22.2/daemon/seahorse-service-bindings.h --- seahorse-2.22.1/daemon/seahorse-service-bindings.h 2008-04-07 04:08:32.000000000 +0200 +++ seahorse-2.22.2/daemon/seahorse-service-bindings.h 2008-01-07 17:49:55.000000000 +0100 @@ -53,7 +53,7 @@ #endif /* !G_ENABLE_DEBUG */ -/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.BQM58T:1) */ +/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZB9M4T:1) */ extern void dbus_glib_marshal_seahorse_service_BOOLEAN__POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -62,10 +62,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_BOOLEAN__POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer data1, @@ -100,7 +100,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,BOXED,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.BQM58T:2) */ +/* BOOLEAN:STRING,BOXED,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZB9M4T:2) */ extern void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_BOXED_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -109,10 +109,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_BOXED_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_BOXED_POINTER_POINTER) (gpointer data1, @@ -151,7 +151,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.BQM58T:3) */ +/* BOOLEAN:STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZB9M4T:3) */ extern void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -160,10 +160,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_POINTER_POINTER) (gpointer data1, @@ -200,7 +200,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.BQM58T:4) */ +/* BOOLEAN:STRING,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZB9M4T:4) */ extern void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_STRING_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -209,10 +209,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_STRING_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_POINTER_POINTER) (gpointer data1, @@ -251,7 +251,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,STRING,STRING,BOOLEAN,POINTER (/tmp/dbus-binding-tool-c-marshallers.BQM58T:5) */ +/* BOOLEAN:STRING,STRING,STRING,BOOLEAN,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZB9M4T:5) */ extern void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_STRING_STRING_BOOLEAN_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -260,10 +260,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_BOOLEAN__STRING_STRING_STRING_BOOLEAN_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_STRING_BOOLEAN_POINTER) (gpointer data1, diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/daemon/seahorse-service-crypto-bindings.h /tmp/enEhoodfaf/seahorse-2.22.2/daemon/seahorse-service-crypto-bindings.h --- seahorse-2.22.1/daemon/seahorse-service-crypto-bindings.h 2008-04-07 04:08:33.000000000 +0200 +++ seahorse-2.22.2/daemon/seahorse-service-crypto-bindings.h 2008-01-07 17:49:55.000000000 +0100 @@ -53,7 +53,7 @@ #endif /* !G_ENABLE_DEBUG */ -/* BOOLEAN:BOXED,STRING,INT,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.8YX38T:1) */ +/* BOOLEAN:BOXED,STRING,INT,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.GP0N4T:1) */ extern void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__BOXED_STRING_INT_STRING_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -62,10 +62,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__BOXED_STRING_INT_STRING_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_STRING_INT_STRING_POINTER_POINTER) (gpointer data1, @@ -108,7 +108,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,INT,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.8YX38T:2) */ +/* BOOLEAN:STRING,INT,STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.GP0N4T:2) */ extern void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__STRING_INT_STRING_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -117,10 +117,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__STRING_INT_STRING_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER_POINTER) (gpointer data1, @@ -161,7 +161,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,INT,STRING,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.8YX38T:3) */ +/* BOOLEAN:STRING,INT,STRING,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.GP0N4T:3) */ extern void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__STRING_INT_STRING_POINTER_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -170,10 +170,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_crypto_BOOLEAN__STRING_INT_STRING_POINTER_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER_POINTER_POINTER) (gpointer data1, diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/daemon/seahorse-service-keyset-bindings.h /tmp/enEhoodfaf/seahorse-2.22.2/daemon/seahorse-service-keyset-bindings.h --- seahorse-2.22.1/daemon/seahorse-service-keyset-bindings.h 2008-04-07 04:08:32.000000000 +0200 +++ seahorse-2.22.2/daemon/seahorse-service-keyset-bindings.h 2008-01-07 17:49:55.000000000 +0100 @@ -53,7 +53,7 @@ #endif /* !G_ENABLE_DEBUG */ -/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2SR48T:1) */ +/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.VDZM4T:1) */ extern void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -62,10 +62,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer data1, @@ -100,7 +100,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,BOXED,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2SR48T:2) */ +/* BOOLEAN:STRING,BOXED,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.VDZM4T:2) */ extern void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__STRING_BOXED_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -109,10 +109,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__STRING_BOXED_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_BOXED_POINTER_POINTER) (gpointer data1, @@ -151,7 +151,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:STRING,STRING,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2SR48T:3) */ +/* BOOLEAN:STRING,STRING,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.VDZM4T:3) */ extern void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__STRING_STRING_POINTER_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -160,10 +160,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__STRING_STRING_POINTER_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_POINTER_POINTER_POINTER) (gpointer data1, @@ -204,7 +204,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:BOXED,INT,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2SR48T:4) */ +/* BOOLEAN:BOXED,INT,POINTER,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.VDZM4T:4) */ extern void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__BOXED_INT_POINTER_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -213,10 +213,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__BOXED_INT_POINTER_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_INT_POINTER_POINTER_POINTER) (gpointer data1, @@ -257,7 +257,7 @@ g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:BOXED,INT,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2SR48T:5) */ +/* BOOLEAN:BOXED,INT,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.VDZM4T:5) */ extern void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__BOXED_INT_POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -266,10 +266,10 @@ gpointer marshal_data); void dbus_glib_marshal_seahorse_service_keyset_BOOLEAN__BOXED_INT_POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, + GValue *return_value, guint n_param_values, const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, + gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_INT_POINTER_POINTER) (gpointer data1, diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/debian/changelog /tmp/enEhoodfaf/seahorse-2.22.2/debian/changelog --- seahorse-2.22.1/debian/changelog 2008-05-27 10:43:57.000000000 +0200 +++ seahorse-2.22.2/debian/changelog 2008-05-27 10:43:58.000000000 +0200 @@ -1,3 +1,13 @@ +seahorse (2.22.2-0ubuntu1) hardy-proposed; urgency=low + + * New upstream version: + - Fix importing keys from hkp keyservers. + - Build fixes. + * debian/patches/12_import_key.patch: + - the change is in the new version + + -- Sebastien Bacher Tue, 27 May 2008 10:33:56 +0200 + seahorse (2.22.1-0ubuntu2) hardy; urgency=low * debian/patches/12_import_key.patch: fix importing of remote keys to diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/debian/patches/12_import_key.patch /tmp/enEhoodfaf/seahorse-2.22.2/debian/patches/12_import_key.patch --- seahorse-2.22.1/debian/patches/12_import_key.patch 2008-05-27 10:43:57.000000000 +0200 +++ seahorse-2.22.2/debian/patches/12_import_key.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -Index: seahorse-2.22.1/libseahorse/seahorse-hkp-source.c -=================================================================== ---- seahorse-2.22.1.orig/libseahorse/seahorse-hkp-source.c -+++ seahorse-2.22.1/libseahorse/seahorse-hkp-source.c -@@ -821,6 +821,7 @@ - gchar *t; - SoupURI *uri; - const gchar *fpr; -+ gchar hexfpr[11]; - GHashTable *form; - guint len; - GSList *l; -@@ -847,6 +848,9 @@ - (GDestroyNotify)gpgmex_data_release); - } - -+ /* prepend the hex prefix (0x) to make keyservers happy */ -+ strncpy(hexfpr, "0x", 3); -+ - form = g_hash_table_new (g_str_hash, g_str_equal); - for (l = keyids; l; l = g_slist_next (l)) { - -@@ -855,10 +859,12 @@ - len = strlen (fpr); - if (len > 8) - fpr += (len - 8); -+ -+ strncpy(hexfpr + 2, fpr, 9); - - /* The get key URI */ - g_hash_table_insert (form, "op", "get"); -- g_hash_table_insert (form, "search", (char *)fpr); -+ g_hash_table_insert (form, "search", (char *)hexfpr); - soup_uri_set_query_from_form (uri, form); - - message = soup_message_new_from_uri ("GET", uri); diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/debian/patches/series /tmp/enEhoodfaf/seahorse-2.22.2/debian/patches/series --- seahorse-2.22.1/debian/patches/series 2008-05-27 10:43:57.000000000 +0200 +++ seahorse-2.22.2/debian/patches/series 2008-05-27 10:43:58.000000000 +0200 @@ -3,4 +3,3 @@ 09_xul1.9.patch 11_ubuntu_keyserver.patch 10_relibtoolize.patch -12_import_key.patch diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/libseahorse/seahorse-gpg-options.c /tmp/enEhoodfaf/seahorse-2.22.2/libseahorse/seahorse-gpg-options.c --- seahorse-2.22.1/libseahorse/seahorse-gpg-options.c 2008-04-07 03:52:52.000000000 +0200 +++ seahorse-2.22.2/libseahorse/seahorse-gpg-options.c 2008-05-26 19:35:03.000000000 +0200 @@ -22,9 +22,12 @@ #include #include #include +#include +#include #include #include #include +#include #include "seahorse-gpgmex.h" #include "seahorse-util.h" diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/libseahorse/seahorse-hkp-source.c /tmp/enEhoodfaf/seahorse-2.22.2/libseahorse/seahorse-hkp-source.c --- seahorse-2.22.1/libseahorse/seahorse-hkp-source.c 2008-04-07 03:52:52.000000000 +0200 +++ seahorse-2.22.2/libseahorse/seahorse-hkp-source.c 2008-05-26 19:35:03.000000000 +0200 @@ -821,6 +821,7 @@ gchar *t; SoupURI *uri; const gchar *fpr; + gchar hexfpr[11]; GHashTable *form; guint len; GSList *l; @@ -847,6 +848,9 @@ (GDestroyNotify)gpgmex_data_release); } + /* prepend the hex prefix (0x) to make keyservers happy */ + strncpy(hexfpr, "0x", 3); + form = g_hash_table_new (g_str_hash, g_str_equal); for (l = keyids; l; l = g_slist_next (l)) { @@ -855,10 +859,12 @@ len = strlen (fpr); if (len > 8) fpr += (len - 8); + + strncpy(hexfpr + 2, fpr, 9); /* The get key URI */ g_hash_table_insert (form, "op", "get"); - g_hash_table_insert (form, "search", (char *)fpr); + g_hash_table_insert (form, "search", (char *)hexfpr); soup_uri_set_query_from_form (uri, form); message = soup_message_new_from_uri ("GET", uri); diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/libseahorse/seahorse-secure-memory.c /tmp/enEhoodfaf/seahorse-2.22.2/libseahorse/seahorse-secure-memory.c --- seahorse-2.22.1/libseahorse/seahorse-secure-memory.c 2008-04-07 03:52:52.000000000 +0200 +++ seahorse-2.22.2/libseahorse/seahorse-secure-memory.c 2008-05-26 19:35:03.000000000 +0200 @@ -94,16 +94,34 @@ } } +static gboolean +seahorse_try_gk_secure_memory () +{ + gpointer p; + + p = gnome_keyring_memory_try_alloc (10); + if (p != NULL) { + gnome_keyring_memory_free (p); + return TRUE; + } + + return FALSE; +} + void seahorse_secure_memory_init () { - GMemVTable vtable; - - memset (&vtable, 0, sizeof (vtable)); - vtable.malloc = switch_malloc; - vtable.realloc = switch_realloc; - vtable.free = switch_free; - vtable.calloc = switch_calloc; - g_mem_set_vtable (&vtable); -} + if (seahorse_try_gk_secure_memory() == TRUE) { + GMemVTable vtable; + memset (&vtable, 0, sizeof (vtable)); + vtable.malloc = switch_malloc; + vtable.realloc = switch_realloc; + vtable.free = switch_free; + vtable.calloc = switch_calloc; + g_mem_set_vtable (&vtable); + } else { + g_warning ("Unable to allocate secure memory from gnome-keyring.\n"); + g_warning ("Proceeding using insecure memory for password fields.\n"); + } +} diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/NEWS /tmp/enEhoodfaf/seahorse-2.22.2/NEWS --- seahorse-2.22.1/NEWS 2008-04-07 03:57:27.000000000 +0200 +++ seahorse-2.22.2/NEWS 2008-05-26 19:37:52.000000000 +0200 @@ -1,3 +1,9 @@ +seahorse 2.22.2 +--------------- + + * Fix importing keys from hkp keyservers. [Mackenzie Morgan] + * Build fixes. [Brian Cameron] + seahorse 2.22.1 --------------- diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/plugins/applet/docs/ChangeLog /tmp/enEhoodfaf/seahorse-2.22.2/plugins/applet/docs/ChangeLog --- seahorse-2.22.1/plugins/applet/docs/ChangeLog 2008-04-07 03:52:45.000000000 +0200 +++ seahorse-2.22.2/plugins/applet/docs/ChangeLog 2008-05-26 19:34:58.000000000 +0200 @@ -1,3 +1,7 @@ +2008-04-14 Jorge Gonzalez + + * es/es.po: Updated Spanish translation, fixes bug #528053 + 2008-02-27 Claude Paroz * fr/fr.po: Updated French translation. diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/plugins/applet/docs/es/es.po /tmp/enEhoodfaf/seahorse-2.22.2/plugins/applet/docs/es/es.po --- seahorse-2.22.1/plugins/applet/docs/es/es.po 2008-04-07 04:11:03.000000000 +0200 +++ seahorse-2.22.2/plugins/applet/docs/es/es.po 2008-05-26 19:52:17.000000000 +0200 @@ -1,12 +1,12 @@ -# translation of applet-help.HEAD.po to Español +# translation of applet-help.gnome-2-22.po to Español # spanish translation for encription-applet manual # # Jorge González , 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: applet-help.HEAD\n" -"POT-Creation-Date: 2008-02-11 21:24+0000\n" -"PO-Revision-Date: 2008-02-11 22:22+0100\n" +"Project-Id-Version: applet-help.gnome-2-22\n" +"POT-Creation-Date: 2008-04-03 04:02+0100\n" +"PO-Revision-Date: 2008-04-14 19:47+0200\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -212,8 +212,7 @@ #: C/seahorse-applet.xml:75(title) msgid "To Add Encryption Applet to a Panel" -msgstr "" -"Añadir la miniaplicación de Cifrado a un panel" +msgstr "Añadir la miniaplicación de Cifrado a un panel" #: C/seahorse-applet.xml:76(para) msgid "" @@ -274,12 +273,11 @@ msgstr "" "Las preferencias para la miniaplicación de Cifrado son parte de su Cifrado y depósitos de claves y se pueden editar seleccionando SistemaPreferenciasCifrado y depósitos de claves, o pulsando con el botón derecho sobre la miniaplicación de Cifrado y seleccionando " -"Preferencias." +"application> y se pueden editar seleccionando SistemaPreferenciasCifrado y depósitos " +"de claves, o pulsando con el botón derecho sobre " +"la miniaplicación de Cifrado y seleccionando " +"Preferencias." #: C/seahorse-applet.xml:109(title) msgid "Display options" @@ -346,3 +344,4 @@ #: C/seahorse-applet.xml:0(None) msgid "translator-credits" msgstr "Jorge González , 2007-2008." + diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/plugins/applet/docs/es/seahorse-applet.xml /tmp/enEhoodfaf/seahorse-2.22.2/plugins/applet/docs/es/seahorse-applet.xml --- seahorse-2.22.1/plugins/applet/docs/es/seahorse-applet.xml 2008-04-07 04:11:02.000000000 +0200 +++ seahorse-2.22.2/plugins/applet/docs/es/seahorse-applet.xml 2008-05-26 19:52:17.000000000 +0200 @@ -86,7 +86,7 @@ Preferencias de la miniaplicación de Cifrado - Las preferencias para la miniaplicación de Cifrado son parte de su Cifrado y depósitos de claves y se pueden editar seleccionando SistemaPreferenciasCifrado y depósitos de claves, o pulsando con el botón derecho sobre la miniaplicación de Cifrado y seleccionando Preferencias. + Las preferencias para la miniaplicación de Cifrado son parte de su Cifrado y depósitos de claves y se pueden editar seleccionando SistemaPreferenciasCifrado y depósitos de claves, o pulsando con el botón derecho sobre la miniaplicación de Cifrado y seleccionando Preferencias. Opciones de mostrado Estas opciones afectan sobre si una ventana que muestra el texto resultante se presenta después de realizar una operación de cifrado. Activar estas opciones puede ser útil al leer un correo web o gestionar otras tareas de cifrado donde un campo puede no estar fácilmente disponible o se requiere una visualización inmediata. diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/po/zh_CN.po /tmp/enEhoodfaf/seahorse-2.22.2/po/zh_CN.po --- seahorse-2.22.1/po/zh_CN.po 2008-04-07 03:52:45.000000000 +0200 +++ seahorse-2.22.2/po/zh_CN.po 2008-05-26 19:34:55.000000000 +0200 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-04 12:24+0000\n" -"PO-Revision-Date: 2008-02-04 20:55+0800\n" +"POT-Creation-Date: 2008-02-21 14:01+0000\n" +"PO-Revision-Date: 2008-04-12 10:36+0800\n" "Last-Translator: Deng Xiyue \n" "Language-Team: i18n-zh \n" "MIME-Version: 1.0\n" @@ -40,7 +40,9 @@ msgstr "PGP 密钥：%s" #: ../agent/seahorse-agent-cache.glade.h:1 -msgid "Warning: Your system is not configured to cache passphrases in secure memory." +msgid "" +"Warning: Your system is not configured to cache passphrases in secure " +"memory." msgstr "警告：您的系统未配置使用安全内存中缓存的密码。" #: ../agent/seahorse-agent-cache.glade.h:2 @@ -211,15 +213,23 @@ msgstr "%s 的加密密钥" #: ../data/seahorse.schemas.in.h:1 -msgid "A list of key server URIs to search for remote PGP keys. In later versions a display name can be included, by appending a space and then the name." -msgstr "用于寻找远程 PGP 密钥的密钥服务器 URI 列表。在将来的版本中可通过在末尾附加一个空格和名称来加入显示名称。" +msgid "" +"A list of key server URIs to search for remote PGP keys. In later versions a " +"display name can be included, by appending a space and then the name." +msgstr "" +"用于寻找远程 PGP 密钥的密钥服务器 URI 列表。在将来的版本中可通过在末尾附加一" +"个空格和名称来加入显示名称。" #: ../data/seahorse.schemas.in.h:2 -msgid "After performing an decrypt or verify operation from the applet, display the resulting text in a window." +msgid "" +"After performing an decrypt or verify operation from the applet, display the " +"resulting text in a window." msgstr "在面板程序中执行解密或验证操作后，在窗体中显示结果文本。" #: ../data/seahorse.schemas.in.h:3 -msgid "After performing an encrypt or signing operation from the applet, display the resulting text in a window." +msgid "" +"After performing an encrypt or signing operation from the applet, display " +"the resulting text in a window." msgstr "在面板程序中执行解密或验证操作后，在窗体中显示结果文本。" #: ../data/seahorse.schemas.in.h:4 @@ -263,8 +273,12 @@ msgstr "开启 DNS-SD 共享" #: ../data/seahorse.schemas.in.h:14 -msgid "Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be running and must be built with HKP and DNS-SD support." -msgstr "开启 DNS-SD (Apple Bonjour) 密钥的共享。 必须运行 seahorse-daemon 并且其必须编译加入 HKP 和 DNS-SD 支持。" +msgid "" +"Enables DNS-SD (Apple Bonjour) sharing of keys. seahorse-daemon must be " +"running and must be built with HKP and DNS-SD support." +msgstr "" +"开启 DNS-SD (Apple Bonjour) 密钥的共享。 必须运行 seahorse-daemon 并且其必须" +"编译加入 HKP 和 DNS-SD 支持。" #: ../data/seahorse.schemas.in.h:15 msgid "Expire passwords in the cache" @@ -275,15 +289,23 @@ msgstr "缺省密钥的 ID" #: ../data/seahorse.schemas.in.h:17 -msgid "If set to 'gnome' uses gnome-keyring to cache passwords. When set to 'internal' uses internal cache." -msgstr "如设置为‘gnome’，使用 gnome-keyring 来缓存密码。当设置为‘internal’时，使用内部缓存" +msgid "" +"If set to 'gnome' uses gnome-keyring to cache passwords. When set to " +"'internal' uses internal cache." +msgstr "" +"如设置为‘gnome’，使用 gnome-keyring 来缓存密码。当设置为‘internal’时，使用内" +"部缓存" #: ../data/seahorse.schemas.in.h:18 -msgid "If set to true, then files encrypted with seahorse will be ASCII armor encoded." +msgid "" +"If set to true, then files encrypted with seahorse will be ASCII armor " +"encoded." msgstr "如果设置为真，使用 seahorse 加密的文档会使用 ASCII 方式封装编码。" #: ../data/seahorse.schemas.in.h:19 -msgid "If set to true, then the default key will always be added to an encryption recipients list." +msgid "" +"If set to true, then the default key will always be added to an encryption " +"recipients list." msgstr "如果设置为真，默认密钥将总是被加入加密收件人列表中。" #: ../data/seahorse.schemas.in.h:20 @@ -311,15 +333,21 @@ msgstr "将密钥发行至此密钥服务器" #: ../data/seahorse.schemas.in.h:26 -msgid "Reflect the contents of the clipboard (whether encrypted, signed, etc...) in the panel applet icon." +msgid "" +"Reflect the contents of the clipboard (whether encrypted, signed, etc...) in " +"the panel applet icon." msgstr "在面板小程序图标中反映剪贴板的内容(是否加密，签署等...)" #: ../data/seahorse.schemas.in.h:27 -msgid "Set to 'true' to enable display of the cache reminder in the notification area of your panel." +msgid "" +"Set to 'true' to enable display of the cache reminder in the notification " +"area of your panel." msgstr "设置为‘true’以开启在面板提示区域显示缓存提示。" #: ../data/seahorse.schemas.in.h:28 -msgid "Set to 'true' to have seahorse-agent prompt before giving out passwords it has cached." +msgid "" +"Set to 'true' to have seahorse-agent prompt before giving out passwords it " +"has cached." msgstr "设置为‘true’以使 seahorse-agent 在给出缓存的密码之前提示。" #: ../data/seahorse.schemas.in.h:29 @@ -343,12 +371,20 @@ msgstr "显示密钥管理员的有效性列" #: ../data/seahorse.schemas.in.h:34 -msgid "Specify the column to sort the recipients window by. Columns are: 'name' and 'id'. Put a '-' in front of the column name to sort in descending order." -msgstr "指定一列来排序收件人窗口。列为：‘名称’和‘id’。在列名前加上‘-’以逆排序。" +msgid "" +"Specify the column to sort the recipients window by. Columns are: 'name' and " +"'id'. Put a '-' in front of the column name to sort in descending order." +msgstr "" +"指定一列来排序收件人窗口。列为：‘名称’和‘id’。在列名前加上‘-’以逆排序。" #: ../data/seahorse.schemas.in.h:35 -msgid "Specify the column to sort the seahorse key manager main window by. Columns are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in front of the column name to sort in descending order." -msgstr "指定一列来排序 seahorse 密钥管理器主窗口。列为：‘名称’，‘id’，‘有效性’，‘有效日期’，‘信任’和‘类型’。在列名前加上‘-’以逆排序。" +msgid "" +"Specify the column to sort the seahorse key manager main window by. Columns " +"are: 'name', 'id', 'validity', 'expires', 'trust', and 'type'. Put a '-' in " +"front of the column name to sort in descending order." +msgstr "" +"指定一列来排序 seahorse 密钥管理器主窗口。列为：‘名称’，‘id’，‘有效性’，‘有效" +"日期’，‘信任’和‘类型’。在列名前加上‘-’以逆排序。" #: ../data/seahorse.schemas.in.h:36 msgid "The ID of the last secret key used to sign a message." @@ -363,11 +399,15 @@ msgstr "用来排序 seahorse 密钥的列" #: ../data/seahorse.schemas.in.h:39 -msgid "The key server to publish PGP keys to. Or empty to suppress publishing of PGP keys." +msgid "" +"The key server to publish PGP keys to. Or empty to suppress publishing of " +"PGP keys." msgstr "用来发行 PGP 密钥的服务器。留空以禁止发行 PGP 密钥。" #: ../data/seahorse.schemas.in.h:40 -msgid "The last key server a search was performed against or empty for all key servers." +msgid "" +"The last key server a search was performed against or empty for all key " +"servers." msgstr "上次搜索的密钥服务器，或留空以指定所有密钥服务器。" #: ../data/seahorse.schemas.in.h:41 @@ -379,19 +419,28 @@ msgstr "缓存 GPG 密码的时间(以分钟计算)" #: ../data/seahorse.schemas.in.h:43 -msgid "This is the amount of time, specified in minutes, to cache GPG passwords in seahorse-agent." +msgid "" +"This is the amount of time, specified in minutes, to cache GPG passwords in " +"seahorse-agent." msgstr "这是在 seahorse-agent 中缓存 GPG 密码的时间，以分钟计算。" #: ../data/seahorse.schemas.in.h:44 -msgid "This option enables the GPG password cache in the seahorse-agent program. The 'use-agent' setting in gpg.conf affects this setting." -msgstr "本选项开启 seahorse-agent 缓存 GPG 密码。在 gpg.conf 中的‘use-agent’设置会影响本设置。" +msgid "" +"This option enables the GPG password cache in the seahorse-agent program. " +"The 'use-agent' setting in gpg.conf affects this setting." +msgstr "" +"本选项开启 seahorse-agent 缓存 GPG 密码。在 gpg.conf 中的‘use-agent’设置会影" +"响本设置。" #: ../data/seahorse.schemas.in.h:45 -msgid "This specifies the default key to use for certain operations, mainly signing." +msgid "" +"This specifies the default key to use for certain operations, mainly signing." msgstr "这里指定操作所使用的默认密钥，主要用于签署。" #: ../data/seahorse.schemas.in.h:46 -msgid "When set, seahorse-agent expires GPG passwords in its cache after a period of time." +msgid "" +"When set, seahorse-agent expires GPG passwords in its cache after a period " +"of time." msgstr "设置后， seahorse-agent 缓存的密码会在一段时间后过期。" #: ../data/seahorse.schemas.in.h:47 @@ -403,7 +452,9 @@ msgstr "是否自动从密钥服务器获取密钥。" #: ../data/seahorse.schemas.in.h:49 -msgid "Whether or not modified keys should be automatically synced with the default key server." +msgid "" +"Whether or not modified keys should be automatically synced with the default " +"key server." msgstr "已修改的密钥是否自动与默认密钥服务器同步。" #: ../data/seahorse.schemas.in.h:50 @@ -459,15 +510,17 @@ #: ../libseahorse/seahorse-add-keyring.glade.h:1 msgid "Add Password Keyring" -msgstr "添加密码密钥链" +msgstr "添加密码密钥环" #: ../libseahorse/seahorse-add-keyring.glade.h:2 msgid "New Keyring Name:" -msgstr "新密钥链名称：" +msgstr "新密钥环名称：" #: ../libseahorse/seahorse-add-keyring.glade.h:3 -msgid "Please choose a name for the new keyring. You will be prompted for an unlock password." -msgstr "请为新密钥链选择名称。你将会被提示输入解锁密码。" +msgid "" +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." +msgstr "请为新密钥环选择名称。你将会被提示输入解锁密码。" #: ../libseahorse/seahorse-add-keyring.glade.h:4 #: ../libseahorse/seahorse-add-keyserver.glade.h:5 @@ -624,7 +677,7 @@ #: ../libseahorse/seahorse-notification.c:644 msgid "Signing key not in keyring." -msgstr "用来签署的密钥不在密钥链中" +msgstr "用来签署的密钥不在密钥环中" #: ../libseahorse/seahorse-notification.c:645 msgid "Unknown Signature" @@ -687,12 +740,12 @@ msgstr "无效" #: ../libseahorse/seahorse-pgp-key.c:162 -#: ../src/seahorse-pgp-public-key-properties.glade.h:30 +#: ../src/seahorse-pgp-public-key-properties.glade.h:31 msgid "Public PGP Key" msgstr "PGP 公钥" #: ../libseahorse/seahorse-pgp-key.c:165 -#: ../src/seahorse-pgp-private-key-properties.glade.h:35 +#: ../src/seahorse-pgp-private-key-properties.glade.h:36 msgid "Private PGP Key" msgstr "PGP 私钥" @@ -724,8 +777,12 @@ msgstr "正在载入密钥..." #: ../libseahorse/seahorse-pgp-source.c:821 -msgid "Invalid key data (missing UIDs). This may be due to a computer with a date set in the future or a missing self-signature." -msgstr "无效的密钥数据(缺少 UID)。这可能是由于电脑时间设置成未来时间或者缺少自我签名。" +msgid "" +"Invalid key data (missing UIDs). This may be due to a computer with a date " +"set in the future or a missing self-signature." +msgstr "" +"无效的密钥数据(缺少 UID)。这可能是由于电脑时间设置成未来时间或者缺少自我签" +"名。" #: ../libseahorse/seahorse-pgp-source.c:942 ../src/seahorse-key-manager.c:446 #: ../src/seahorse-key-manager.c:494 @@ -741,7 +798,9 @@ msgstr "不是有效的密钥服务器地址。" #: ../libseahorse/seahorse-prefs.c:65 -msgid "For help contact your system adminstrator or the administrator of the key server." +msgid "" +"For help contact your system adminstrator or the administrator of the key " +"server." msgstr "请向您的系统管理员或密钥服务器管理员寻求帮助。" #: ../libseahorse/seahorse-prefs.c:176 @@ -766,32 +825,32 @@ #: ../libseahorse/seahorse-prefs-keyrings.c:242 msgid "Couldn't get default password keyring" -msgstr "无法获得默认密码密钥链" +msgstr "无法获得默认密码密钥环" #: ../libseahorse/seahorse-prefs-keyrings.c:265 msgid "Couldn't get list of password keyrings" -msgstr "无法获得密码密钥链列表" +msgstr "无法获得密码密钥环列表" #: ../libseahorse/seahorse-prefs-keyrings.c:321 msgid "Couldn't set default password keyring" -msgstr "无法设置默认密码密钥链" +msgstr "无法设置默认密码密钥环" #: ../libseahorse/seahorse-prefs-keyrings.c:403 msgid "Couldn't remove keyring" -msgstr "无法移除密钥链" +msgstr "无法移除密钥环" #: ../libseahorse/seahorse-prefs-keyrings.c:421 #, c-format msgid "Are you sure you want to permanently delete the '%s' keyring?" -msgstr "确认要永久删除‘%s’密钥链？" +msgstr "确认要永久删除‘%s’密钥环？" #: ../libseahorse/seahorse-prefs-keyrings.c:469 msgid "Couldn't add keyring" -msgstr "无法添加密钥链" +msgstr "无法添加密钥环" #: ../libseahorse/seahorse-prefs-keyrings.c:526 msgid "Couldn't change keyring password" -msgstr "无法修改密钥链密码" +msgstr "无法修改密钥环密码" #: ../libseahorse/seahorse-prefs.glade.h:1 msgid "Default Key" @@ -799,11 +858,11 @@ #: ../libseahorse/seahorse-prefs.glade.h:2 msgid "Default Keyring" -msgstr "默认密钥链" +msgstr "默认密钥环" #: ../libseahorse/seahorse-prefs.glade.h:3 msgid "Password Keyrings" -msgstr "密码密钥链" +msgstr "密码密钥环" #: ../libseahorse/seahorse-prefs.glade.h:4 msgid "Remember PGP Passphrases" @@ -851,7 +910,7 @@ #: ../libseahorse/seahorse-prefs.glade.h:15 msgid "Password Keyrings" -msgstr "密码密钥链" +msgstr "密码密钥环" #: ../libseahorse/seahorse-prefs.glade.h:16 msgid "Password and Encryption Settings" @@ -859,11 +918,14 @@ #: ../libseahorse/seahorse-prefs.glade.h:17 msgid "" -"Sharing your keys allows other people on your network to use the keys you've collected. This means they can automatically encrypt things for you or those you know, without you having to send them your key.\n" +"Sharing your keys allows other people on your network to use the keys you've " +"collected. This means they can automatically encrypt things for you or those " +"you know, without you having to send them your key.\n" "\n" "Note: Your personal keys will not be compromised." msgstr "" -"共享您的密钥允许您网络上的其他人使用您搜集的密钥。这意味着他们可以自动为您或您认识的人加密，而无须您将您的密钥发送给他们。\n" +"共享您的密钥允许您网络上的其他人使用您搜集的密钥。这意味着他们可以自动为您或" +"您认识的人加密，而无须您将您的密钥发送给他们。\n" "\n" "注意：您的个人密钥不会被泄露。" @@ -877,7 +939,7 @@ #: ../libseahorse/seahorse-prefs.glade.h:22 msgid "_Add Keyring" -msgstr "添加密钥链(_A)" +msgstr "添加密钥环(_A)" #: ../libseahorse/seahorse-prefs.glade.h:23 msgid "_Always remember passphrases whenever logged in" @@ -909,7 +971,7 @@ #: ../libseahorse/seahorse-prefs.glade.h:30 msgid "_Remove Keyring" -msgstr "移除密钥链(_P)" +msgstr "移除密钥环(_P)" #: ../libseahorse/seahorse-prefs.glade.h:31 msgid "_Share my keys with others on my network" @@ -917,7 +979,7 @@ #: ../libseahorse/seahorse-prefs.glade.h:32 msgid "minutes" -msgstr "摘要" +msgstr "分钟" #: ../libseahorse/seahorse-progress.glade.h:1 msgid "Progress Title" @@ -938,7 +1000,8 @@ msgstr "没有可用于签署的密钥" #: ../libseahorse/seahorse-signer.c:58 -msgid "You have no personal PGP keys that can be used to sign a document or message." +msgid "" +"You have no personal PGP keys that can be used to sign a document or message." msgstr "你没有个人 PGP 密钥可用于签署文档或消息" #: ../libseahorse/seahorse-signer.glade.h:1 @@ -956,7 +1019,7 @@ #: ../libseahorse/seahorse-ssh-key.c:94 ../libseahorse/seahorse-ssh-key.c:98 #: ../libseahorse/seahorse-ssh-source.c:746 #: ../src/seahorse-generate-select.c:145 -#: ../src/seahorse-ssh-key-properties.glade.h:20 +#: ../src/seahorse-ssh-key-properties.glade.h:21 msgid "Secure Shell Key" msgstr "SSH 密钥" @@ -1028,7 +1091,7 @@ #: ../libseahorse/seahorse-ssh-operation.c:1029 msgid "Save this passphrase in my keyring" -msgstr "将此密码存储在我的密钥链中" +msgstr "将此密码存储在我的密钥环中" #: ../libseahorse/seahorse-ssh-operation.c:1081 #, c-format @@ -1439,7 +1502,7 @@ msgstr[1] "加密已选择的文件" #: ../plugins/nautilus-ext/seahorse-nautilus.c:168 -#: ../src/seahorse-pgp-private-key-properties.glade.h:38 +#: ../src/seahorse-pgp-private-key-properties.glade.h:39 msgid "Sign" msgstr "签署" @@ -1464,7 +1527,7 @@ #: ../plugins/nautilus/seahorse-pgp-preferences.desktop.in.h:2 msgid "Encryption and Keyrings" -msgstr "加密和密钥链" +msgstr "加密和密钥环" #: ../plugins/nautilus/seahorse-tool.c:58 msgid "Import keys from the file" @@ -1837,7 +1900,9 @@ #: ../src/seahorse-delete.c:40 #, c-format -msgid "%s is a private key. Make sure you have a backup. Do you still want to delete it?" +msgid "" +"%s is a private key. Make sure you have a backup. Do you still want to " +"delete it?" msgstr "%s 是私钥。请确认您有备份。您仍然要删除吗？" #: ../src/seahorse-delete.c:74 @@ -2001,21 +2066,21 @@ msgstr "应用程序" #: ../src/seahorse-gkeyring-item-properties.glade.h:6 -#: ../src/seahorse-pgp-private-key-properties.glade.h:22 -#: ../src/seahorse-pgp-public-key-properties.glade.h:19 -#: ../src/seahorse-ssh-key-properties.glade.h:16 +#: ../src/seahorse-pgp-private-key-properties.glade.h:23 +#: ../src/seahorse-pgp-public-key-properties.glade.h:20 +#: ../src/seahorse-ssh-key-properties.glade.h:17 msgid "Details" msgstr "细节" #: ../src/seahorse-gkeyring-item-properties.glade.h:7 -#: ../src/seahorse-ssh-key-properties.glade.h:18 +#: ../src/seahorse-ssh-key-properties.glade.h:19 msgid "Key" msgstr "密钥" #: ../src/seahorse-gkeyring-item-properties.glade.h:8 -#: ../src/seahorse-pgp-private-key-properties.glade.h:29 -#: ../src/seahorse-pgp-public-key-properties.glade.h:28 -#: ../src/seahorse-ssh-key-properties.glade.h:19 +#: ../src/seahorse-pgp-private-key-properties.glade.h:30 +#: ../src/seahorse-pgp-public-key-properties.glade.h:29 +#: ../src/seahorse-ssh-key-properties.glade.h:20 msgid "Key Properties" msgstr "密钥首选项" @@ -2032,35 +2097,39 @@ msgstr "显示密码(_W)" #: ../src/seahorse-gkeyring-item-properties.glade.h:12 -#: ../src/seahorse-pgp-private-key-properties.glade.h:41 -#: ../src/seahorse-pgp-public-key-properties.glade.h:35 +#: ../src/seahorse-pgp-private-key-properties.glade.h:42 +#: ../src/seahorse-pgp-public-key-properties.glade.h:36 msgid "Type:" msgstr "类型：" -#: ../src/seahorse-gkeyring-item-properties.glade.h:13 +#. To translators: This is the noun not the verb. +#: ../src/seahorse-gkeyring-item-properties.glade.h:14 msgid "Use:" msgstr "使用：" -#: ../src/seahorse-gkeyring-item-properties.glade.h:14 +#. To translators: This is the infinitive not the imperative. +#: ../src/seahorse-gkeyring-item-properties.glade.h:16 msgid "_Delete" msgstr "删除(_D)" -#: ../src/seahorse-gkeyring-item-properties.glade.h:15 +#: ../src/seahorse-gkeyring-item-properties.glade.h:17 #: ../src/seahorse-revoke.glade.h:5 msgid "_Description:" msgstr "描述(_D)：" -#: ../src/seahorse-gkeyring-item-properties.glade.h:16 +#. To translators: This is the infinitive not the imperative. +#: ../src/seahorse-gkeyring-item-properties.glade.h:19 msgid "_Read" msgstr "读取(_R)" -#: ../src/seahorse-gkeyring-item-properties.glade.h:17 +#. To translators: This is the infinitive not the imperative. +#: ../src/seahorse-gkeyring-item-properties.glade.h:21 msgid "_Write" msgstr "写入(_W)" #: ../src/seahorse-gkeyring-operation.c:204 msgid "Access to the key ring was denied" -msgstr "访问密钥链被拒绝" +msgstr "访问密钥环被拒绝" #: ../src/seahorse-gkeyring-operation.c:207 msgid "The gnome-keyring daemon is not running" @@ -2068,15 +2137,15 @@ #: ../src/seahorse-gkeyring-operation.c:210 msgid "The key ring has already been unlocked" -msgstr "密钥链已经被解锁" +msgstr "密钥环已经被解锁" #: ../src/seahorse-gkeyring-operation.c:213 msgid "No such key ring exists" -msgstr "不存在该密钥链" +msgstr "不存在该密钥环" #: ../src/seahorse-gkeyring-operation.c:216 msgid "Couldn't communicate with key ring daemon" -msgstr "无法与密钥链守护进程通讯" +msgstr "无法与密钥环守护进程通讯" #: ../src/seahorse-gkeyring-operation.c:219 msgid "The item already exists" @@ -2144,7 +2213,7 @@ #: ../src/seahorse-key-manager.c:679 msgid "Back up Key Rings to Archive" -msgstr "将密钥链备份到存档" +msgstr "将密钥环备份到存档" #: ../src/seahorse-key-manager.c:833 msgid "Contributions:" @@ -2189,11 +2258,11 @@ #: ../src/seahorse-key-manager.c:1179 msgid "Import keys into your key ring from a file" -msgstr "从文件向密钥链中导入您的密钥" +msgstr "从文件向密钥环中导入您的密钥" #: ../src/seahorse-key-manager.c:1180 msgid "_Back up Key Rings..." -msgstr "备份密钥链(_B)..." +msgstr "备份密钥环(_B)..." #: ../src/seahorse-key-manager.c:1181 msgid "Back up all keys" @@ -2316,7 +2385,9 @@ msgstr "为 SSH 设定计算机" #: ../src/seahorse-key-manager.c:1227 -msgid "Send public Secure Shell key to another machine, and enable logins using that key." +msgid "" +"Send public Secure Shell key to another machine, and enable logins using " +"that key." msgstr "发送 SSH 公钥到另一个机器，并开启使用该密钥登录" #: ../src/seahorse-key-manager.c:1231 ../src/seahorse-keyserver-results.c:406 @@ -2399,7 +2470,7 @@ #. Trust column #: ../src/seahorse-key-manager-store.c:968 -#: ../src/seahorse-pgp-public-key-properties.glade.h:34 +#: ../src/seahorse-pgp-public-key-properties.glade.h:35 msgid "Trust" msgstr "信任" @@ -2479,7 +2550,7 @@ #: ../src/seahorse-keyserver-results.c:107 msgid "Couldn't import keys into key ring" -msgstr "无法向密钥链导入密钥" +msgstr "无法向密钥环导入密钥" #: ../src/seahorse-keyserver-results.c:128 msgid "Importing keys from key servers" @@ -2525,7 +2596,7 @@ #: ../src/seahorse-keyserver-results.c:396 msgid "Import selected keys to local key ring" -msgstr "将已选择的密钥导入到本地密钥链" +msgstr "将已选择的密钥导入到本地密钥环" #: ../src/seahorse-keyserver-results.c:399 msgid "Save Key As..." @@ -2569,8 +2640,10 @@ msgstr "寻找远程密钥" #: ../src/seahorse-keyserver-search.glade.h:4 -msgid "This will find keys for others on the Internet. These keys can then be imported into your local key ring." -msgstr "这将在互联网上寻找其他人的密钥。这些密钥可以导入您的本地密钥链。" +msgid "" +"This will find keys for others on the Internet. These keys can then be " +"imported into your local key ring." +msgstr "这将在互联网上寻找其他人的密钥。这些密钥可以导入您的本地密钥环。" #: ../src/seahorse-keyserver-search.glade.h:5 msgid "Where to search:" @@ -2619,12 +2692,22 @@ msgstr "同步密钥" #: ../src/seahorse-keyserver-sync.glade.h:3 -msgid "This will publish the keys in your key ring so they're available for others to use. You'll also get any changes others have made since you received their keys." -msgstr "这将发行您密钥链里的密钥，这样它们可供其他人来使用。您也可以获得自上次获得别人密钥以来别人进行的修改" +msgid "" +"This will publish the keys in your key ring so they're available for others " +"to use. You'll also get any changes others have made since you received " +"their keys." +msgstr "" +"这将发行您密钥环里的密钥，这样它们可供其他人来使用。您也可以获得自上次获得别" +"人密钥以来别人进行的修改" #: ../src/seahorse-keyserver-sync.glade.h:4 -msgid "This will retrieve any changes others have made since you received their keys. No key server has been chosen for publishing, so your keys will not be made available to others." -msgstr "这将取回自上次您获得他们的密钥以来别人所作的所有改变。没有指定用来发行的密钥服务器，所以您的密钥无法被其他人使用。" +msgid "" +"This will retrieve any changes others have made since you received their " +"keys. No key server has been chosen for publishing, so your keys will not be " +"made available to others." +msgstr "" +"这将取回自上次您获得他们的密钥以来别人所作的所有改变。没有指定用来发行的密钥" +"服务器，所以您的密钥无法被其他人使用。" #: ../src/seahorse-keyserver-sync.glade.h:5 msgid "_Key Servers" @@ -2639,7 +2722,9 @@ msgstr "您选择了多个文件或文件夹" #: ../src/seahorse-multi-encrypt.glade.h:2 -msgid "Because the files are located remotely, each file will be encrypted separately." +msgid "" +"Because the files are located remotely, each file will be encrypted " +"separately." msgstr "因为文件在远程方，每个文件将会被分开加密。" #: ../src/seahorse-multi-encrypt.glade.h:3 @@ -2807,109 +2892,110 @@ msgid "Type:" msgstr "类型：" -#: ../src/seahorse-pgp-private-key-properties.glade.h:14 -#: ../src/seahorse-pgp-public-key-properties.glade.h:13 -#: ../src/seahorse-ssh-key-properties.glade.h:12 +#. To translators: This is the noun not the verb. +#: ../src/seahorse-pgp-private-key-properties.glade.h:15 +#: ../src/seahorse-pgp-public-key-properties.glade.h:14 +#: ../src/seahorse-ssh-key-properties.glade.h:13 msgid "Use:" msgstr "使用：" -#: ../src/seahorse-pgp-private-key-properties.glade.h:15 -#: ../src/seahorse-pgp-public-key-properties.glade.h:17 +#: ../src/seahorse-pgp-private-key-properties.glade.h:16 +#: ../src/seahorse-pgp-public-key-properties.glade.h:18 msgid "_Subkeys" msgstr "子密钥(_S)" -#: ../src/seahorse-pgp-private-key-properties.glade.h:16 +#: ../src/seahorse-pgp-private-key-properties.glade.h:17 msgid "Add" msgstr "添加" -#: ../src/seahorse-pgp-private-key-properties.glade.h:17 +#: ../src/seahorse-pgp-private-key-properties.glade.h:18 msgid "Add a photo to this key" msgstr "向此密钥添加照片" -#: ../src/seahorse-pgp-private-key-properties.glade.h:18 -#: ../src/seahorse-ssh-key-properties.glade.h:15 +#: ../src/seahorse-pgp-private-key-properties.glade.h:19 +#: ../src/seahorse-ssh-key-properties.glade.h:16 msgid "Change _Passphrase" msgstr "更改密码(_P)" -#: ../src/seahorse-pgp-private-key-properties.glade.h:19 -#: ../src/seahorse-pgp-public-key-properties.glade.h:18 +#: ../src/seahorse-pgp-private-key-properties.glade.h:20 +#: ../src/seahorse-pgp-public-key-properties.glade.h:19 msgid "Created:" msgstr "创建：" -#: ../src/seahorse-pgp-private-key-properties.glade.h:20 +#: ../src/seahorse-pgp-private-key-properties.glade.h:21 msgid "Decrypt files and email sent to you." msgstr "解密发给您的文件和电子邮件" -#: ../src/seahorse-pgp-private-key-properties.glade.h:21 +#: ../src/seahorse-pgp-private-key-properties.glade.h:22 msgid "Delete" msgstr "删除" -#: ../src/seahorse-pgp-private-key-properties.glade.h:23 +#: ../src/seahorse-pgp-private-key-properties.glade.h:24 msgid "Expire" msgstr "过期" -#: ../src/seahorse-pgp-private-key-properties.glade.h:24 -#: ../src/seahorse-pgp-public-key-properties.glade.h:21 +#: ../src/seahorse-pgp-private-key-properties.glade.h:25 +#: ../src/seahorse-pgp-public-key-properties.glade.h:22 msgid "Expires:" msgstr "过期：" -#: ../src/seahorse-pgp-private-key-properties.glade.h:25 +#: ../src/seahorse-pgp-private-key-properties.glade.h:26 msgid "Export" msgstr "导出" -#: ../src/seahorse-pgp-private-key-properties.glade.h:26 +#: ../src/seahorse-pgp-private-key-properties.glade.h:27 msgid "Go to next photo" msgstr "到下个照片" -#: ../src/seahorse-pgp-private-key-properties.glade.h:27 +#: ../src/seahorse-pgp-private-key-properties.glade.h:28 msgid "Go to previous photo" msgstr "到上个照片" -#: ../src/seahorse-pgp-private-key-properties.glade.h:28 -#: ../src/seahorse-pgp-public-key-properties.glade.h:27 +#: ../src/seahorse-pgp-private-key-properties.glade.h:29 +#: ../src/seahorse-pgp-public-key-properties.glade.h:28 msgid "Key ID:" msgstr "密钥 ID：" -#: ../src/seahorse-pgp-private-key-properties.glade.h:30 +#: ../src/seahorse-pgp-private-key-properties.glade.h:31 msgid "Make this photo the primary photo" msgstr "使用此照片作为主照片" -#: ../src/seahorse-pgp-private-key-properties.glade.h:31 +#: ../src/seahorse-pgp-private-key-properties.glade.h:32 msgid "Names and Signatures" msgstr "名称和签名" -#: ../src/seahorse-pgp-private-key-properties.glade.h:32 +#: ../src/seahorse-pgp-private-key-properties.glade.h:33 msgid "Override Owner _Trust:" msgstr "覆盖所有者信任状态(_T)：" -#: ../src/seahorse-pgp-private-key-properties.glade.h:33 -#: ../src/seahorse-pgp-public-key-properties.glade.h:29 +#: ../src/seahorse-pgp-private-key-properties.glade.h:34 +#: ../src/seahorse-pgp-public-key-properties.glade.h:30 msgid "Owner" msgstr "所有者" -#: ../src/seahorse-pgp-private-key-properties.glade.h:34 +#: ../src/seahorse-pgp-private-key-properties.glade.h:35 msgid "Primary" msgstr "主要" -#: ../src/seahorse-pgp-private-key-properties.glade.h:36 +#: ../src/seahorse-pgp-private-key-properties.glade.h:37 msgid "Remove this photo from this key" msgstr "从此密钥中移除此照片" -#: ../src/seahorse-pgp-private-key-properties.glade.h:37 +#: ../src/seahorse-pgp-private-key-properties.glade.h:38 msgid "Revoke" msgstr "撤回" -#: ../src/seahorse-pgp-private-key-properties.glade.h:39 -#: ../src/seahorse-pgp-public-key-properties.glade.h:31 +#: ../src/seahorse-pgp-private-key-properties.glade.h:40 +#: ../src/seahorse-pgp-public-key-properties.glade.h:32 msgid "Strength:" msgstr "保密强度：" -#: ../src/seahorse-pgp-private-key-properties.glade.h:40 -#: ../src/seahorse-pgp-public-key-properties.glade.h:32 +#: ../src/seahorse-pgp-private-key-properties.glade.h:41 +#: ../src/seahorse-pgp-public-key-properties.glade.h:33 msgid "The owner of the key revoked the key. It can no longer be used." msgstr "此密钥的所有者已撤回此密钥。它将不能被使用。" -#: ../src/seahorse-pgp-private-key-properties.glade.h:42 +#: ../src/seahorse-pgp-private-key-properties.glade.h:43 msgid "" "Unknown\n" "Never\n" @@ -2923,11 +3009,11 @@ "完全\n" "彻底" -#: ../src/seahorse-pgp-private-key-properties.glade.h:47 +#: ../src/seahorse-pgp-private-key-properties.glade.h:48 msgid "_Add Name" msgstr "添加名称(_A)" -#: ../src/seahorse-pgp-private-key-properties.glade.h:48 +#: ../src/seahorse-pgp-private-key-properties.glade.h:49 msgid "_Export Complete Key:" msgstr "导出完整密钥(_E)" @@ -2944,41 +3030,42 @@ msgid "Indicate Trust:" msgstr "是否信任：" -#: ../src/seahorse-pgp-public-key-properties.glade.h:14 +#: ../src/seahorse-pgp-public-key-properties.glade.h:15 msgid "Your trust of this key" msgstr "您是否信任此密钥" -#: ../src/seahorse-pgp-public-key-properties.glade.h:15 +#: ../src/seahorse-pgp-public-key-properties.glade.h:16 msgid "_Other Names:" msgstr "其他名称(_O)：" -#: ../src/seahorse-pgp-public-key-properties.glade.h:16 +#: ../src/seahorse-pgp-public-key-properties.glade.h:17 msgid "_People who have signed this key:" msgstr "其他签署此密钥的人(_P)" -#: ../src/seahorse-pgp-public-key-properties.glade.h:20 +#: ../src/seahorse-pgp-public-key-properties.glade.h:21 msgid "Encrypt files and email to the key's owner " msgstr "加密文件并通过电子邮件发给密钥所有者" -#: ../src/seahorse-pgp-public-key-properties.glade.h:23 +#: ../src/seahorse-pgp-public-key-properties.glade.h:24 #, no-c-format msgid "I have checked that this key belongs to '%s'" msgstr "我已查出此密钥属于 '%s'" -#: ../src/seahorse-pgp-public-key-properties.glade.h:25 +#: ../src/seahorse-pgp-public-key-properties.glade.h:26 #, no-c-format msgid "I trust signatures from '%s' on other keys " msgstr "我相信其他密钥的来自 '%s' 签名" -#: ../src/seahorse-pgp-public-key-properties.glade.h:26 -msgid "If you no longer trust this person's identity, revoke your signature:" +#: ../src/seahorse-pgp-public-key-properties.glade.h:27 +msgid "" +"If you no longer trust this person's identity, revoke your signature:" msgstr "如果您不再相信此人的身份，请撤回您的签名：" -#: ../src/seahorse-pgp-public-key-properties.glade.h:33 +#: ../src/seahorse-pgp-public-key-properties.glade.h:34 msgid "To indicate your trust of this key to others, sign this key:" msgstr "为向他人表明您对此密钥的信任，请签署此密钥：" -#: ../src/seahorse-pgp-public-key-properties.glade.h:36 +#: ../src/seahorse-pgp-public-key-properties.glade.h:37 msgid "" "Unknown\n" "Never\n" @@ -2992,23 +3079,23 @@ "完全\n" "彻底" -#: ../src/seahorse-pgp-public-key-properties.glade.h:41 +#: ../src/seahorse-pgp-public-key-properties.glade.h:42 msgid "You _Trust the Owner:" msgstr "您相信此所有者(_T)：" -#: ../src/seahorse-pgp-public-key-properties.glade.h:42 +#: ../src/seahorse-pgp-public-key-properties.glade.h:43 msgid "Your trust is manually specified on the Details tab." msgstr "您的信任度在细节栏手动指定。" -#: ../src/seahorse-pgp-public-key-properties.glade.h:43 +#: ../src/seahorse-pgp-public-key-properties.glade.h:44 msgid "_Only display the signatures of people I trust" msgstr "仅显示我信任的人的签名(_O)" -#: ../src/seahorse-pgp-public-key-properties.glade.h:44 +#: ../src/seahorse-pgp-public-key-properties.glade.h:45 msgid "_Revoke Signature" msgstr "撤回签名(_R)：" -#: ../src/seahorse-pgp-public-key-properties.glade.h:45 +#: ../src/seahorse-pgp-public-key-properties.glade.h:46 msgid "_Sign this Key" msgstr "签属此密钥(_S)" @@ -3034,8 +3121,11 @@ msgstr "调整大虾(_R)" #: ../src/seahorse-photos.c:125 -msgid "This is not a image file, or an unrecognized kind of image file. Try to use a JPEG image." -msgstr "这不是一个图像文件，或者是一个无法识别类型的图像文件。请尝试使用 JPEG 图像" +msgid "" +"This is not a image file, or an unrecognized kind of image file. Try to use " +"a JPEG image." +msgstr "" +"这不是一个图像文件，或者是一个无法识别类型的图像文件。请尝试使用 JPEG 图像" #: ../src/seahorse-photos.c:221 msgid "All image files" @@ -3113,7 +3203,9 @@ #: ../src/seahorse-revoke.c:173 #, c-format -msgid "You are about to add %s as a revoker for %s. This operation cannot be undone! Are you sure you want to continue?" +msgid "" +"You are about to add %s as a revoker for %s. This operation cannot be " +"undone! Are you sure you want to continue?" msgstr "您将为 %2$s 添加 %1$s 作为撤回者。此操作不能取消！您确认您要继续吗？" #: ../src/seahorse-revoke.c:188 @@ -3141,7 +3233,9 @@ msgstr "无法签署密钥" #: ../src/seahorse-sign.c:160 -msgid "You have no personal PGP keys that can be used to indicate your trust of this key." +msgid "" +"You have no personal PGP keys that can be used to indicate your trust of " +"this key." msgstr "您没有个人 PGP 密钥可用于表明您是否信任此密钥" #: ../src/seahorse-sign.glade.h:1 @@ -3179,7 +3273,8 @@ #: ../src/seahorse-sign.glade.h:10 msgid "" -"Very Carefully: Select this only if you are absolutely sure that this\n" +"Very Carefully: Select this only if you are absolutely sure that " +"this\n" "key is genuine." msgstr "非常仔细地：选择此选项仅当您绝对确信此密钥是真实的。" @@ -3310,20 +3405,20 @@ msgid "Trust" msgstr "信任" -#: ../src/seahorse-ssh-key-properties.glade.h:14 +#: ../src/seahorse-ssh-key-properties.glade.h:15 #, no-c-format msgid "This only applies to the '%s' account." msgstr "仅用于 '%s' 帐户" -#: ../src/seahorse-ssh-key-properties.glade.h:17 +#: ../src/seahorse-ssh-key-properties.glade.h:18 msgid "E_xport Complete Key" msgstr "导出完整密钥(_X)" -#: ../src/seahorse-ssh-key-properties.glade.h:21 +#: ../src/seahorse-ssh-key-properties.glade.h:22 msgid "The owner of this key is _authorized to connect to this computer" msgstr "此密钥的拥有者已被授权连接到此计算机(_A)" -#: ../src/seahorse-ssh-key-properties.glade.h:22 +#: ../src/seahorse-ssh-key-properties.glade.h:23 msgid "Used to connect to other computers." msgstr "用来连接到其他计算机" @@ -3383,10 +3478,14 @@ #~ msgid "The 'seahorse-agent' program exited unsuccessfully." #~ msgstr "‘seahorst-agent’程序非正常退出。" -#~ msgid "Note: The 'seahorse-agent' program has been started. This program is necessary in order to cache passphrases. " +#~ msgid "" +#~ "Note: The 'seahorse-agent' program has been started. This program " +#~ "is necessary in order to cache passphrases. " #~ msgstr "注意：‘seahorse-agent’程序已启动。缓存密码需要此程序。" -#~ msgid "Warning: The 'seahorse-agent' program is not running. This program is necessary in order to cache passphrases. " +#~ msgid "" +#~ "Warning: The 'seahorse-agent' program is not running. This program " +#~ "is necessary in order to cache passphrases. " #~ msgstr "警告：‘seahorse-agent’程序没有运行。缓存密码需要此程序。" #~ msgid "Session _Properties" diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/README /tmp/enEhoodfaf/seahorse-2.22.2/README --- seahorse-2.22.1/README 2008-04-07 03:55:31.000000000 +0200 +++ seahorse-2.22.2/README 2008-05-26 19:36:53.000000000 +0200 @@ -1,5 +1,5 @@ Seahorse: a Gnome encryption interface. -This describes version 2.22.1 +This describes version 2.22.2 Seahorse is a graphical interface for managing and using encryption keys. Currently it supports PGP keys (using GPG/GPGME) and SSH keys. Its goal is to diff -Nru /tmp/H52s9y5uIR/seahorse-2.22.1/seahorse.spec /tmp/enEhoodfaf/seahorse-2.22.2/seahorse.spec --- seahorse-2.22.1/seahorse.spec 2008-04-07 04:00:25.000000000 +0200 +++ seahorse-2.22.2/seahorse.spec 2008-05-26 19:40:07.000000000 +0200 @@ -1,6 +1,6 @@ Summary: GNOME2 interface for gnupg Name: seahorse -Version: 2.22.1 +Version: 2.22.2 Release: 0 License: GPL Group: User Interface/Desktop